调整

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

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

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

@@ -174,10 +174,10 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
 
     /**
      * 校验房源的认筹状态
-     * @param houseId
+     * @param houseIds
      * @param personId
      * @param orgId
      * @return
      */
-    boolean checkRaiseState(Integer houseId, String personId, Integer orgId) throws Exception;
+    boolean checkRaiseState(String houseIds, String personId, Integer orgId) throws Exception;
 }

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

@@ -743,15 +743,55 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
     /**
      * 校验房源的认筹状态
      *
-     * @param houseId
+     * @param houseIds
      * @param personId
      * @param orgId
      * @return
      */
     @Override
-    public boolean checkRaiseState(Integer houseId, String personId, Integer orgId) throws Exception {
+    public boolean checkRaiseState(String houseIds, String personId, Integer orgId) throws Exception {
+        String[] houseIdArr = houseIds.split(",");
         //房源信息
-        TaHousingResources taHousingResources = taHousingResourcesMapper.selectById(houseId);
+        TaHousingResources taHousingResources = taHousingResourcesMapper.selectById(houseIdArr[0]);
+        //通过销售批次信息获取认筹信息
+        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("认筹单已经作废");
+        }
+        //校验房源是否同一批次
+        for (String houseId : houseIdArr){
+            TaHousingResources taHousingResourcesChecked = taHousingResourcesMapper.selectById(houseId);
+            if (taHousingResources.getSalesBatchId() != taHousingResourcesChecked.getSalesBatchId()){
+                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("需要先预选才能认筹");
+                }
+            }
+            //查询我的认筹记录表
+            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("您已有认筹单包含当前房源");
+            }
+
+        }
         if (taHousingResources.getStatus() != CommConstant.STATUS_NORMAL) {
             throw new Exception("房源已被取消发布");
         }
@@ -768,30 +808,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
             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();
@@ -799,17 +816,6 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
             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;
     }