bug fix

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

@@ -76,7 +76,7 @@ public class TaRaiseHouseController extends BaseController {
         try {
 
             // 校验参数
-            if (taRaiseHouse.getRaiseRecordId() != null) {
+            if (taRaiseHouse.getRaiseRecordId() == null) {
                 responseBean.addError("参数错误");
                 return responseBean;
             }

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

@@ -724,27 +724,29 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
             return responseBean;
         }
 
-        QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
-        personQueryWrapper.eq("person_id", personId);
-        TaPerson person = taPersonService.getOne(personQueryWrapper);
-        if (person == null) {
-            logger.info("updateLockingStatus 用户未找到");
-            responseBean.addError("fail");
-            return responseBean;
-        }
+        QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
+        taRaiseHouseQueryWrapper.eq("raise_record_id", raiseRecordId);
+        taRaiseHouseQueryWrapper.eq("raise_house_id", raiseHouseId);
+        TaRaiseHouse taRaiseHouse = taRaiseHouseService.getOne(taRaiseHouseQueryWrapper);
+
+        QueryWrapper<TaRaiseRecord> taRaiseRecordQueryWrapper = new QueryWrapper<>();
+        taRaiseRecordQueryWrapper.eq("raise_record_id", raiseRecordId);
+        TaRaiseRecord raiseRecord = taRaiseRecordMapper.selectOne(taRaiseRecordQueryWrapper);
 
         // 更新为锁定状态
-        if ("lock".equals(type)) {
+        if ("locked".equals(type)) {
+                // 校验当前房源状态
+                if ("locked".equals(po.getHouseLockingStatus())){
+                    responseBean.addError("房源已被锁定");
+                    return responseBean;
+                }
 
-            // 校验当前房源状态
-            if (!"locked".equals(po.getHouseLockingStatus())) {
-                // 更行房源表状态
                 TaHousingResources housingResources = new TaHousingResources();
                 housingResources.setHouseId(po.getHouseId());
                 housingResources.setHouseLockingStatus("locked");
-                housingResources.setHouseLockingPerson(personId);
-                housingResources.setUpdateUser(person.getUserId());
+                housingResources.setHouseLockingPerson(taRaiseHouse.getPersonId());
                 housingResources.setUpdateDate(LocalDateTime.now());
+                housingResources.setHouseLockingPerson(raiseRecord.getPersonId());
                 updateById(housingResources);
 
                 //更新认筹单房源锁定状态
@@ -757,26 +759,22 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 TaRaiseHouse raiseHouse = new TaRaiseHouse();
                 raiseHouse.setRaiseHouseId(raiseHouseId);
                 raiseHouse.setHouseLockingStatus("locked");
-                raiseHouse.setPersonId(personId);
-                raiseHouse.setPersonName(person.getName());
                 responseBean.addSuccess(taRaiseHouseService.updateById(raiseHouse));
                 return responseBean;
-            }
-            responseBean.addError("当前房源已为锁定状态");
-            return responseBean;
         }
 
         // 更新为解锁状态
-        if ("unlock".equals(type)) {
+        if ("unlocked".equals(type)) {
+                // 校验当前房源状态
+                if ("unlocked".equals(po.getHouseLockingStatus())){
+                    responseBean.addError("房源已被解锁");
+                    return responseBean;
+                }
 
-            // 校验当前房源状态
-            if ("locked".equals(po.getHouseLockingStatus())) {
-                // 更新房源表状态
                 TaHousingResources housingResources = new TaHousingResources();
                 housingResources.setHouseId(po.getHouseId());
                 housingResources.setHouseLockingStatus("unlocked");
                 housingResources.setHouseLockingPerson("");
-                housingResources.setUpdateUser(person.getUserId());
                 housingResources.setUpdateDate(LocalDateTime.now());
                 updateById(housingResources);
 
@@ -794,9 +792,6 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 raiseHouse.setPersonName("");
                 responseBean.addSuccess(taRaiseHouseService.updateById(raiseHouse));
                 return responseBean;
-            }
-            responseBean.addError("当前房源已为解锁状态");
-            return responseBean;
         }
         responseBean.addError("fail");
         return responseBean;