bug

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

@@ -233,4 +233,11 @@ public class TaRaiseRecord implements Serializable {
      */
     @TableField(exist = false)
     private TaUser consultantInfo;
+
+    /**
+     * 验证码
+     *
+     */
+    @TableField(exist = false)
+    private String captcha;
 }

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

@@ -12,6 +12,7 @@ import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.service.impl.TaUserServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.SMSUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.po.TaHousingResourcesPO;
@@ -72,6 +73,9 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
     @Autowired
     private TaBuildingMapper taBuildingMapper;
 
+    @Autowired
+    SMSUtils smsUtils;
+
     @Override
     public ResponseBean listHousingRaiseByCondition(HousingRaiseRequestBO requestBO, Integer pageNumber, Integer pageSize) {
         logger.info("TaRaiseRecordServiceImpl.listRaiseRecordByCondition 接收参数：bo:{},pageNumber:{},pageSize:{}", JSONObject.toJSONString(requestBO), pageNumber, pageSize);
@@ -116,6 +120,12 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
         if (houseList.size() < 1) {
             throw new Exception("请选择房源！");
         }
+
+        //校验手机号
+        if(!smsUtils.checkCaptcha(taRaiseRecord.getTel(),taRaiseRecord.getCaptcha())){
+            throw new Exception("验证码错误。");
+        }
+
         //获取认筹信息
         TaRaise taRaise = taRaiseMapper.selectById(taRaiseRecord.getRaiseId());
         //如果是自动锁房就要判断里面的房源有没有被锁住
@@ -132,7 +142,7 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
                 throw new Exception("此房源已被锁定！");
             }
             //检验成功的话先锁定房源
-            lockedHouseResources(taHousingResources);
+//            lockedHouseResources(taHousingResources);
         }
         //判断销售批次是否是发布状态和房源是否正常状态
         checkHouseStatus(taRaiseRecord,orgId, personId, taRaise);

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

@@ -386,12 +386,12 @@ public class WxPayServiceImpl implements IWxPayService {
             throw new Exception("自动锁房只能认筹一个房源。");
         }
         //判断此房源有没有被锁定
-//        TaHousingResources taHousingResources = getHousingResourcesById(taRaiseHouseList.get(0).getHouseId());
-//        if (taHousingResources.getHouseLockingStatus().equals(CommConstant.HOUSE_LOCKING_STATUS_LOCKED)){
-//            throw new Exception("改房源已被锁定暂时无法认筹。");
-//        }
+        TaHousingResources taHousingResources = getHousingResourcesById(taRaiseHouseList.get(0).getHouseId());
+        if (taHousingResources.getHouseLockingStatus().equals(CommConstant.HOUSE_LOCKING_STATUS_LOCKED)){
+            throw new Exception("改房源已被锁定暂时无法认筹。");
+        }
         //锁定此房源并且更改认筹单的锁定状态
-//        changeLockingStatus(taRaiseRecord,taRaiseHouseList.get(0),taHousingResources);
+        changeLockingStatus(taRaiseRecord,taRaiseHouseList.get(0),taHousingResources);
     }
 
     /**