调整

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

@@ -49,16 +49,4 @@ public class TaRaiseHouse implements Serializable {
      * 创建时间
      */
     private LocalDateTime createDate;
-
-    /**
-     * 锁定人id
-     */
-    private String personId;
-
-    /**
-     * 锁定人姓名
-     */
-    private String personName;
-
-
 }

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

@@ -682,7 +682,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 TaHousingResources housingResources = new TaHousingResources();
                 housingResources.setHouseId(po.getHouseId());
                 housingResources.setHouseLockingStatus("locked");
-                housingResources.setHouseLockingPerson(taRaiseHouse.getPersonId());
+                housingResources.setHouseLockingPerson(personId);
                 housingResources.setUpdateDate(LocalDateTime.now());
                 housingResources.setHouseLockingPerson(raiseRecord.getPersonId());
                 updateById(housingResources);
@@ -727,8 +727,8 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 TaRaiseHouse raiseHouse = new TaRaiseHouse();
                 raiseHouse.setRaiseHouseId(raiseHouseId);
 //                raiseHouse.setHouseLockingStatus("unlocked");
-                raiseHouse.setPersonId("");
-                raiseHouse.setPersonName("");
+//                raiseHouse.setPersonId("");
+//                raiseHouse.setPersonName("");
                 responseBean.addSuccess(taRaiseHouseService.updateById(raiseHouse));
                 return responseBean;
         }

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

@@ -233,10 +233,6 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
             TaRaiseHouse taRaiseHouse = new TaRaiseHouse();
             taRaiseHouse.setHouseId(e);
             taRaiseHouse.setCreateDate(LocalDateTime.now());
-            if (taRaise.getHouseLockingType().equals(CommConstant.HOUSE_LOCKING_TYPE_AUTO)) {
-                taRaiseHouse.setPersonId(personId);
-                taRaiseHouse.setPersonName(taPerson.getName());
-            }
             taRaiseHouse.setOrgId(orgId);
             taRaiseHouse.setRaiseRecordId(taRaiseRecord.getRaiseRecordId());
             taRaiseHouseMapper.insert(taRaiseHouse);

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

@@ -269,7 +269,7 @@ public class WxPayServiceImpl implements IWxPayService {
     }
 
     private synchronized void autoUnLockingHouse(TaRaiseRecord taRaiseRecord, TaRaiseHouse taRaiseHouse, TaHousingResources taHousingResources) {
-        log.info("正在为客户personId为{}选中的房源id为{}自动解锁",taRaiseHouse.getPersonId(),taRaiseHouse.getHouseId());
+        log.info("正在为客户personId为{}选中的房源id为{}自动解锁",taRaiseRecord.getPersonId(),taRaiseHouse.getHouseId());
         //更改此房源为解锁状态
         taHousingResources.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
         taHousingResourcesMapper.updateById(taHousingResources);
@@ -422,10 +422,10 @@ public class WxPayServiceImpl implements IWxPayService {
      * @param taHousingResources
      */
     private synchronized void changeLockingStatus(TaRaiseRecord taRaiseRecord, TaRaiseHouse taRaiseHouse, TaHousingResources taHousingResources) {
-        log.info("正在为客户personId为{}选中的房源id为{}自动锁房",taRaiseHouse.getPersonId(),taRaiseHouse.getHouseId());
+        log.info("正在为客户personId为{}选中的房源id为{}自动锁房",taRaiseRecord.getPersonId(),taRaiseHouse.getHouseId());
         //更改此房源为锁定状态
         taHousingResources.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
-        taHousingResources.setHouseLockingPerson(taRaiseHouse.getPersonId());
+        taHousingResources.setHouseLockingPerson(taRaiseRecord.getPersonId());
         taHousingResourcesMapper.updateById(taHousingResources);
         //更改此认筹旦和房源关系为锁定状态
 //        taRaiseHouse.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);