Merge remote-tracking branch 'origin/dev' into dev

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

         }
         return responseBean;
     }
+
+    /**
+     * 校验房源认筹状态
+     *
+     * @return
+     */
+    @RequestMapping(value = "/wx/check/raise", method = RequestMethod.GET)
+    public ResponseBean checkRaise(@RequestParam(value = "houseId") Integer houseId,HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            boolean state = iTaHousingResourcesService.checkRaiseState(houseId,getPersonId(request),getOrgId(request));
+            responseBean.addSuccess(state);
+        } catch (Exception e) {
+            logger.error("校验房源状态 -=- {}", e.getMessage());
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_MISSING_PARAMS);
+        }
+        return responseBean;
+    }
 }

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

             responseBean.addSuccess(iTaRaiseRecordService.saveRaiseInfo(taRaiseRecord, getOrgId(request), getPersonId(request)));
         } catch (Exception e) {
             logger.error("微信端下认筹单 -=- {}", e.toString());
-            responseBean.addError(e.getMessage());
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_MISSING_PARAMS);
         }
         return responseBean;
     }

src/main/java/com/huiju/estateagents/service/ITaHousingResourcesService.java

      * @return
      */
     ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId, Integer raiseRecordId);
+
+    /**
+     * 校验房源的认筹状态
+     * @param houseId
+     * @param personId
+     * @param orgId
+     * @return
+     */
+    boolean checkRaiseState(Integer houseId, String personId, Integer orgId) throws Exception;
 }

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

         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;
-    }
-
     /**
      * 校验楼栋信息存不存在
      *
         return responseBean;
     }
 
+    /**
+     * 校验房源的认筹状态
+     *
+     * @param houseId
+     * @param personId
+     * @param orgId
+     * @return
+     */
+    @Override
+    public boolean checkRaiseState(Integer houseId, String personId, Integer orgId) throws Exception {
+        //房源信息
+        TaHousingResources taHousingResources = taHousingResourcesMapper.selectById(houseId);
+        if (taHousingResources.getStatus() != CommConstant.STATUS_NORMAL) {
+            throw new Exception("房源已被取消发布");
+        }
+        if (CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(taHousingResources.getHouseLockingStatus())){
+            throw new Exception("房源已被其他客户锁定");
+        }
+        //销售批次信息
+        TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(taHousingResources.getSalesBatchId());
+        //销售批次校验
+        if (null == taSalesBatch) {
+            throw new Exception("无销售批次无法认筹");
+        }
+        if (taSalesBatch.getStatus() != CommConstant.STATUS_NORMAL) {
+            throw new Exception("销售批次已被取消发布");
+        }
+
+        //通过销售批次信息获取认筹信息
+        QueryWrapper<TaRaise> taRaiseQueryWrapper = new QueryWrapper<>();
+        taRaiseQueryWrapper.eq("org_id",orgId);
+        taRaiseQueryWrapper.eq("sales_batch_id",taHousingResources.getSalesBatchId());
+        taRaiseQueryWrapper.eq("building_id",taHousingResources.getBuildingId());
+        TaRaise taRaise = taRaiseMapper.selectOne(taRaiseQueryWrapper);
+        if (taRaise.getStatus() != CommConstant.STATUS_NORMAL) {
+            throw new Exception("认筹单已经作废");
+        }
+        if (taRaise.getNeedPreselection()) {
+            //查看是否有当前房源的预选记录
+            QueryWrapper<TaPreselectionRecord> preselectionRecordQueryWrapper = new QueryWrapper<>();
+            preselectionRecordQueryWrapper.eq("sales_batch_id", taRaise.getSalesBatchId());
+            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) {
+                throw new Exception("需要先预选才能认筹");
+            }
+        }
+        //判断是否在时间之内
+
+        LocalDateTime raiseStartTime = taRaise.getRaiseStartTime();
+        LocalDateTime raiseEndTime = taRaise.getRaiseEndTime();
+        LocalDateTime now = LocalDateTime.now();
+        if (now.isBefore(raiseStartTime) || now.isAfter(raiseEndTime)) {
+            throw new Exception("不在认筹时间内");
+        }
+
+
+        //查询我的认筹记录表
+        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) {
+            throw new Exception("您已有认筹单包含当前房源");
+        }
+
+        return true;
+    }
+
     //更新房号
     private void updateRoom(TaHousingResources taHousingResources) {
         TaBuildingRoom taBuildingRoom = new TaBuildingRoom();