bug

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

@@ -122,6 +122,16 @@ public class CommonController extends BaseController {
         }
     }
 
+    @PostMapping("{plat}/check/captcha")
+    public ResponseBean sendCaptcha(@RequestParam String tel,@RequestParam String captcha) {
+        boolean success = smsUtils.checkCaptcha(tel,captcha);
+        if (success) {
+            return ResponseBean.success("验证码校验成功");
+        } else {
+            return ResponseBean.error("验证码校验失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
     @GetMapping("/center/dict/templateType")
     public ResponseBean getAllTplTypes() {
         return ResponseBean.success(iTdMiniappTemplateTypeService.getAllTypes());

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

@@ -50,12 +50,12 @@ public class TaRaise implements Serializable {
     /**
      * 认筹开始时间
      */
-    private String raiseStartTime;
+    private LocalDateTime raiseStartTime;
 
     /**
      * 认筹结束时间
      */
-    private String raiseEndTime;
+    private LocalDateTime raiseEndTime;
 
     /**
      * 锁房方式 auto自动锁房，manual手动锁房

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

@@ -276,12 +276,72 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
         if (null == taRaise) {
             resourcesPO.setRaiseBtn(false);
         } else {
+            //有认筹表的情况下判断是否认筹过这个房源
+            boolean raiseBtnStatus = checkRaiseBtn(taRaise,salesBatchId,personId,houseId,orgId);
             resourcesPO.setTaRaise(taRaise);
         }
 
         return resourcesPO;
     }
 
+    /**
+     * 校验认筹状态的按钮
+     * @param taRaise
+     * @param salesBatchId
+     * @param personId
+     * @param houseId
+     * @param orgId
+     * @return
+     */
+    private boolean checkRaiseBtn(TaRaise taRaise, Integer salesBatchId, String personId, Integer houseId, Integer orgId) {
+        if (taRaise.getStatus() != CommConstant.STATUS_NORMAL){
+            return false;
+        }
+        if (taRaise.getNeedPreselection()){
+            //查看是否有当前房源的预选记录
+            QueryWrapper<TaPreselectionRecord> preselectionRecordQueryWrapper = new QueryWrapper<>();
+            preselectionRecordQueryWrapper.eq("sales_batch_id",salesBatchId);
+            preselectionRecordQueryWrapper.eq("building_id",taRaise.getBuildingId());
+            preselectionRecordQueryWrapper.eq("org_id",orgId);
+            preselectionRecordQueryWrapper.eq("house_id",houseId);
+            preselectionRecordQueryWrapper.eq("person_id",personId);
+            TaPreselectionRecord taPreselectionRecord = taPreselectionRecordMapper.selectOne(preselectionRecordQueryWrapper);
+            if (null == taPreselectionRecord){
+                return false;
+            }
+        }
+        //判断是否在时间之内
+        LocalDateTime raiseStartTime = taRaise.getRaiseStartTime();
+        LocalDateTime raiseEndTime = taRaise.getRaiseEndTime();
+        LocalDateTime now = LocalDateTime.now();
+        if (now.isBefore(raiseStartTime) || now.isAfter(raiseEndTime)){
+            return false;
+        }
+        //销售批次校验
+        TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(salesBatchId);
+        if (taSalesBatch.getStatus() != CommConstant.STATUS_NORMAL){
+            return false;
+        }
+
+        //房源信息
+        TaHousingResources taHousingResources = taHousingResourcesMapper.selectById(houseId);
+        if (taHousingResources.getStatus() != CommConstant.STATUS_NORMAL || CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(taHousingResources.getHouseLockingStatus())){
+            return false;
+        }
+
+        //查询我的认筹记录表
+        QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
+        taRaiseHouseQueryWrapper.eq("org_id",orgId);
+        taRaiseHouseQueryWrapper.eq("house_id",houseId);
+        taRaiseHouseQueryWrapper.eq("person_id",personId);
+        List<TaRaiseHouse> list = taRaiseHouseService.list(taRaiseHouseQueryWrapper);
+        if (list.size() > 0){
+            return false;
+        }
+
+        return true;
+    }
+
     /**
      * 校验楼栋信息存不存在
      *