weichaochao 5 lat temu
rodzic
commit
d184fde58c

+ 5
- 0
src/main/java/com/huiju/estateagents/bo/request/RaiseOrderRequestBO.java Wyświetl plik

62
      * 结束时间
62
      * 结束时间
63
      */
63
      */
64
     private String payEndTime;
64
     private String payEndTime;
65
+
66
+    /**
67
+     * 微信订单号
68
+     */
69
+    private String tradeNo;
65
 }
70
 }

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaHousingResourcesController.java Wyświetl plik

488
      * @return
488
      * @return
489
      */
489
      */
490
     @RequestMapping(value = "/admin/house/updateLockingStatus", method = RequestMethod.PUT)
490
     @RequestMapping(value = "/admin/house/updateLockingStatus", method = RequestMethod.PUT)
491
-    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer raiseHouseId, String personId,
491
+    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer raiseHouseId, String personId,Integer raiseRecordId,
492
                                             HttpServletRequest request) {
492
                                             HttpServletRequest request) {
493
         ResponseBean responseBean = new ResponseBean();
493
         ResponseBean responseBean = new ResponseBean();
494
         try {
494
         try {
495
-            responseBean = iTaHousingResourcesService.updateLockingStatus(houseId, type, getOrgId(request), raiseHouseId, personId);
495
+            responseBean = iTaHousingResourcesService.updateLockingStatus(houseId, type, getOrgId(request), raiseHouseId, personId, raiseRecordId);
496
             logger.info("updateLockingStatus 返回结果:", JSONObject.toJSONString(responseBean));
496
             logger.info("updateLockingStatus 返回结果:", JSONObject.toJSONString(responseBean));
497
         } catch (Exception e) {
497
         } catch (Exception e) {
498
             logger.error("updateLockingStatus 异常:", e);
498
             logger.error("updateLockingStatus 异常:", e);

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaHousingResourcesService.java Wyświetl plik

170
      * @param personId
170
      * @param personId
171
      * @return
171
      * @return
172
      */
172
      */
173
-    ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId);
173
+    ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId, Integer raiseRecordId);
174
 }
174
 }

+ 16
- 1
src/main/java/com/huiju/estateagents/service/impl/TaHousingResourcesServiceImpl.java Wyświetl plik

95
     @Autowired
95
     @Autowired
96
     private TaRaiseMapper taRaiseMapper;
96
     private TaRaiseMapper taRaiseMapper;
97
 
97
 
98
+    @Autowired
99
+    private TaRaiseRecordMapper taRaiseRecordMapper;
100
+
98
     /**
101
     /**
99
      * 分页获取房源列表
102
      * 分页获取房源列表
100
      *
103
      *
709
     }
712
     }
710
 
713
 
711
     @Override
714
     @Override
712
-    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId) {
715
+    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId, Integer raiseRecordId) {
713
         logger.info("updateLockingStatus 接收参数:houseId:{},type:{},orgId:{},raiseHouseId:{},personId:{}",
716
         logger.info("updateLockingStatus 接收参数:houseId:{},type:{},orgId:{},raiseHouseId:{},personId:{}",
714
                 houseId, type, orgId, raiseHouseId, personId);
717
                 houseId, type, orgId, raiseHouseId, personId);
715
         ResponseBean responseBean = new ResponseBean();
718
         ResponseBean responseBean = new ResponseBean();
744
                 housingResources.setUpdateDate(LocalDateTime.now());
747
                 housingResources.setUpdateDate(LocalDateTime.now());
745
                 updateById(housingResources);
748
                 updateById(housingResources);
746
 
749
 
750
+                //更新认筹单房源锁定状态
751
+                TaRaiseRecord taRaiseRecord = new TaRaiseRecord();
752
+                taRaiseRecord.setRaiseRecordId(raiseRecordId);
753
+                taRaiseRecord.setHouseLockingStatus("locked");
754
+                taRaiseRecordMapper.updateById(taRaiseRecord);
755
+
747
                 // 更新关联表状态
756
                 // 更新关联表状态
748
                 TaRaiseHouse raiseHouse = new TaRaiseHouse();
757
                 TaRaiseHouse raiseHouse = new TaRaiseHouse();
749
                 raiseHouse.setRaiseHouseId(raiseHouseId);
758
                 raiseHouse.setRaiseHouseId(raiseHouseId);
771
                 housingResources.setUpdateDate(LocalDateTime.now());
780
                 housingResources.setUpdateDate(LocalDateTime.now());
772
                 updateById(housingResources);
781
                 updateById(housingResources);
773
 
782
 
783
+                //更新认筹单房源锁定状态
784
+                TaRaiseRecord taRaiseRecord = new TaRaiseRecord();
785
+                taRaiseRecord.setRaiseRecordId(raiseRecordId);
786
+                taRaiseRecord.setHouseLockingStatus("unlocked");
787
+                taRaiseRecordMapper.updateById(taRaiseRecord);
788
+
774
                 // 更新关联表状态
789
                 // 更新关联表状态
775
                 TaRaiseHouse raiseHouse = new TaRaiseHouse();
790
                 TaRaiseHouse raiseHouse = new TaRaiseHouse();
776
                 raiseHouse.setRaiseHouseId(raiseHouseId);
791
                 raiseHouse.setRaiseHouseId(raiseHouseId);

+ 3
- 0
src/main/resources/mapper/TaRaiseRecordMapper.xml Wyświetl plik

165
             <if test = "bo.transactionId != null and bo.transactionId != ''">
165
             <if test = "bo.transactionId != null and bo.transactionId != ''">
166
                 AND t2.transaction_id = #{bo.transactionId}
166
                 AND t2.transaction_id = #{bo.transactionId}
167
             </if>
167
             </if>
168
+            <if test = "bo.tradeNo != null and bo.tradeNo != ''">
169
+                AND t2.trade_no = #{bo.tradeNo}
170
+            </if>
168
             <if test = "bo.refundNo != null and bo.refundNo != ''">
171
             <if test = "bo.refundNo != null and bo.refundNo != ''">
169
                 AND t2.refund_no = #{bo.refundNo}
172
                 AND t2.refund_no = #{bo.refundNo}
170
             </if>
173
             </if>