bug fix

src/main/java/com/huiju/estateagents/bo/request/RaiseOrderRequestBO.java

@@ -62,4 +62,9 @@ public class RaiseOrderRequestBO {
      * 结束时间
      */
     private String payEndTime;
+
+    /**
+     * 微信订单号
+     */
+    private String tradeNo;
 }

src/main/java/com/huiju/estateagents/controller/TaHousingResourcesController.java

@@ -488,11 +488,11 @@ public class TaHousingResourcesController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/admin/house/updateLockingStatus", method = RequestMethod.PUT)
-    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer raiseHouseId, String personId,
+    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer raiseHouseId, String personId,Integer raiseRecordId,
                                             HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaHousingResourcesService.updateLockingStatus(houseId, type, getOrgId(request), raiseHouseId, personId);
+            responseBean = iTaHousingResourcesService.updateLockingStatus(houseId, type, getOrgId(request), raiseHouseId, personId, raiseRecordId);
             logger.info("updateLockingStatus 返回结果：", JSONObject.toJSONString(responseBean));
         } catch (Exception e) {
             logger.error("updateLockingStatus 异常：", e);

src/main/java/com/huiju/estateagents/service/ITaHousingResourcesService.java

@@ -170,5 +170,5 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
      * @param personId
      * @return
      */
-    ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId);
+    ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId, Integer raiseRecordId);
 }

src/main/java/com/huiju/estateagents/service/impl/TaHousingResourcesServiceImpl.java

@@ -95,6 +95,9 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
     @Autowired
     private TaRaiseMapper taRaiseMapper;
 
+    @Autowired
+    private TaRaiseRecordMapper taRaiseRecordMapper;
+
     /**
      * 分页获取房源列表
      *
@@ -709,7 +712,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
     }
 
     @Override
-    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId) {
+    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId, Integer raiseRecordId) {
         logger.info("updateLockingStatus 接收参数：houseId:{},type:{},orgId:{},raiseHouseId:{},personId:{}",
                 houseId, type, orgId, raiseHouseId, personId);
         ResponseBean responseBean = new ResponseBean();
@@ -744,6 +747,12 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 housingResources.setUpdateDate(LocalDateTime.now());
                 updateById(housingResources);
 
+                //更新认筹单房源锁定状态
+                TaRaiseRecord taRaiseRecord = new TaRaiseRecord();
+                taRaiseRecord.setRaiseRecordId(raiseRecordId);
+                taRaiseRecord.setHouseLockingStatus("locked");
+                taRaiseRecordMapper.updateById(taRaiseRecord);
+
                 // 更新关联表状态
                 TaRaiseHouse raiseHouse = new TaRaiseHouse();
                 raiseHouse.setRaiseHouseId(raiseHouseId);
@@ -771,6 +780,12 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 housingResources.setUpdateDate(LocalDateTime.now());
                 updateById(housingResources);
 
+                //更新认筹单房源锁定状态
+                TaRaiseRecord taRaiseRecord = new TaRaiseRecord();
+                taRaiseRecord.setRaiseRecordId(raiseRecordId);
+                taRaiseRecord.setHouseLockingStatus("unlocked");
+                taRaiseRecordMapper.updateById(taRaiseRecord);
+
                 // 更新关联表状态
                 TaRaiseHouse raiseHouse = new TaRaiseHouse();
                 raiseHouse.setRaiseHouseId(raiseHouseId);

src/main/resources/mapper/TaRaiseRecordMapper.xml

@@ -165,6 +165,9 @@
             <if test = "bo.transactionId != null and bo.transactionId != ''">
                 AND t2.transaction_id = #{bo.transactionId}
             </if>
+            <if test = "bo.tradeNo != null and bo.tradeNo != ''">
+                AND t2.trade_no = #{bo.tradeNo}
+            </if>
             <if test = "bo.refundNo != null and bo.refundNo != ''">
                 AND t2.refund_no = #{bo.refundNo}
             </if>