bug

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

@@ -107,7 +107,7 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
         TaRaise taRaise = taRaiseMapper.selectById(taRaiseRecord.getRaiseId());
         //如果是自动锁房就要判断里面的房源有没有被锁住
         if (taRaise.getHouseLockingType().equals(CommConstant.HOUSE_LOCKING_TYPE_AUTO)) {
-            if (houseList.size() > 0) {
+            if (houseList.size() > 1) {
                 throw new Exception("此认筹为自动锁房只能选择一个房源！");
             }
             //获取房源详细信息
@@ -115,18 +115,32 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
             if (null == taHousingResources) {
                 throw new Exception("此房源不存在！");
             }
-            if (taHousingResources.getHouseLockingStatus().equals(CommConstant.HOUSE_LOCKING_STATUS_LOCKED)) {
+            if (CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(taHousingResources.getHouseLockingStatus())) {
                 throw new Exception("此房源已被锁定！");
             }
             //检验成功的话先锁定房源
             lockedHouseResources(taHousingResources);
         }
+        //判断销售批次是否是发布状态和房源是否正常状态
+        checkHouseStatus(taRaiseRecord,orgId, personId, taRaise);
+        //判断我是否认筹过这些房源
+
         //插入认筹单
         saveRaiseRecord(taRaiseRecord, orgId, personId, taRaise);
 
         return taRaiseRecord;
     }
 
+    //判断销售批次是否是发布状态和房源是否正常状态
+    private void checkHouseStatus(TaRaiseRecord taRaiseRecord, Integer orgId, String personId, TaRaise taRaise) throws Exception {
+        //销售批次是否有效状态
+        TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(taRaise.getSalesBatchId());
+        if (!taSalesBatch.getStatus().equals(CommConstant.STATUS_NORMAL)){
+            throw new Exception("此销售批次已经取消发布！");
+        }
+        //
+    }
+
     @Override
     public TaRaiseRecord getUserInfo(Integer raiseRecordId, Integer orgId) {
         return taRaiseRecordMapper.getUserInfo(raiseRecordId, orgId);
@@ -182,10 +196,12 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
             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.setPersonId(personId);
-            taRaiseHouse.setPersonName(taPerson.getName());
             taRaiseHouse.setRaiseRecordId(taRaiseRecord.getRaiseRecordId());
             taRaiseHouseMapper.insert(taRaiseHouse);
         });