调整

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

@@ -275,7 +275,7 @@ public class TaHousingResourcesController extends BaseController {
                     //我的认筹
                     if (e.getHouseId().equals(r.getHouseId())) {
                         e.setMineRaise("mine");
-                        if (CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(r.getHouseLockingStatus())) {
+                        if (CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(e.getHouseLockingStatus())) {
                             e.setMineLocked("mine");
                         }
                     }

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

@@ -559,7 +559,7 @@ public class TaRaiseRecordController extends BaseController {
             houseList.forEach(e -> {
                 taRaiseHouseList.forEach(r -> {
                     //我的认筹
-                    if (e.getHouseId().equals(r.getHouseId()) && CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(r.getHouseLockingStatus())) {
+                    if (e.getHouseId().equals(r.getHouseId()) && CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(e.getHouseLockingStatus())) {
                         e.setMineLocked("mine");
                     }
                 });

src/main/java/com/huiju/estateagents/entity/TaRaiseHouse.java

@@ -50,11 +50,6 @@ public class TaRaiseHouse implements Serializable {
      */
     private LocalDateTime createDate;
 
-    /**
-     * 锁定状态 locked已锁定unlocked未锁定
-     */
-    private String houseLockingStatus;
-
     /**
      * 锁定人id
      */

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

@@ -694,10 +694,11 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 taRaiseRecordMapper.updateById(taRaiseRecord);
 
                 // 更新关联表状态
-                TaRaiseHouse raiseHouse = new TaRaiseHouse();
-                raiseHouse.setRaiseHouseId(raiseHouseId);
-                raiseHouse.setHouseLockingStatus("locked");
-                responseBean.addSuccess(taRaiseHouseService.updateById(raiseHouse));
+//                TaRaiseHouse raiseHouse = new TaRaiseHouse();
+//                raiseHouse.setRaiseHouseId(raiseHouseId);
+//                raiseHouse.setHouseLockingStatus("locked");
+//            taRaiseHouseService.updateById(raiseHouse);
+                responseBean.addSuccess(taRaiseRecordMapper.updateById(taRaiseRecord));
                 return responseBean;
         }
 
@@ -725,7 +726,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 // 更新关联表状态
                 TaRaiseHouse raiseHouse = new TaRaiseHouse();
                 raiseHouse.setRaiseHouseId(raiseHouseId);
-                raiseHouse.setHouseLockingStatus("unlocked");
+//                raiseHouse.setHouseLockingStatus("unlocked");
                 raiseHouse.setPersonId("");
                 raiseHouse.setPersonName("");
                 responseBean.addSuccess(taRaiseHouseService.updateById(raiseHouse));

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

@@ -234,11 +234,8 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
             taRaiseHouse.setHouseId(e);
             taRaiseHouse.setCreateDate(LocalDateTime.now());
             if (taRaise.getHouseLockingType().equals(CommConstant.HOUSE_LOCKING_TYPE_AUTO)) {
-                taRaiseHouse.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
                 taRaiseHouse.setPersonId(personId);
                 taRaiseHouse.setPersonName(taPerson.getName());
-            } else {
-                taRaiseHouse.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
             }
             taRaiseHouse.setOrgId(orgId);
             taRaiseHouse.setRaiseRecordId(taRaiseRecord.getRaiseRecordId());

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

@@ -274,8 +274,8 @@ public class WxPayServiceImpl implements IWxPayService {
         taHousingResources.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
         taHousingResourcesMapper.updateById(taHousingResources);
         //更改此认筹旦和房源关系为解锁状态
-        taRaiseHouse.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
-        taRaiseHouseMapper.updateById(taRaiseHouse);
+//        taRaiseHouse.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
+//        taRaiseHouseMapper.updateById(taRaiseHouse);
         //更改认筹单为解锁状态
         taRaiseRecord.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
         taRaiseRecordMapper.updateById(taRaiseRecord);
@@ -428,8 +428,8 @@ public class WxPayServiceImpl implements IWxPayService {
         taHousingResources.setHouseLockingPerson(taRaiseHouse.getPersonId());
         taHousingResourcesMapper.updateById(taHousingResources);
         //更改此认筹旦和房源关系为锁定状态
-        taRaiseHouse.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
-        taRaiseHouseMapper.updateById(taRaiseHouse);
+//        taRaiseHouse.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
+//        taRaiseHouseMapper.updateById(taRaiseHouse);
         //更改认筹单为锁定状态
         taRaiseRecord.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
         taRaiseRecordMapper.updateById(taRaiseRecord);