Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

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

@@ -290,7 +290,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         TaBuilding building = object.toJavaObject(TaBuilding.class);
 
-        boolean isMainMoreThanTenFlag = countIsMainBuilding(building, orgId);
+        boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(building, orgId, null);
         if (!isMainMoreThanTenFlag){
             responseBean.addError("每个城市只能推荐10个楼盘到首页，请先将已推荐楼盘取消推荐后再推荐当前楼盘。");
             return responseBean;
@@ -404,12 +404,6 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         TaBuilding building = object.toJavaObject(TaBuilding.class);
 
-        boolean isMainMoreThanTenFlag = countIsMainBuilding(building, orgId);
-        if (!isMainMoreThanTenFlag){
-            responseBean.addError("每个城市只能推荐10个楼盘到首页，请先将已推荐楼盘取消推荐后再推荐当前楼盘。");
-            return responseBean;
-        }
-
         if(null!= object.getDate("openingDate")){
             building.setOpeningDate(DateUtils.date2LocalDateTime(object.getDate("openingDate")));
         }
@@ -495,6 +489,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
     @Override
     public ResponseBean buildingUpdateStatus(String parameter, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
         TaBuilding  building = new TaBuilding();
         JSONObject jsonobject = JSONObject.parseObject(parameter);
         Integer  status= jsonobject.getInteger("status");
@@ -504,6 +499,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         buildingIdQueryWrapper.eq("org_id", orgId);
         building.setBuildingId(id);
         building.setStatus(status);
+
+        boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(taBuildingMapper.selectOne(buildingIdQueryWrapper), orgId, status);
+        if (!isMainMoreThanTenFlag){
+            responseBean.addError("每个城市只能推荐10个楼盘到首页，请先将已推荐楼盘取消推荐后再推荐当前楼盘。");
+            return responseBean;
+        }
+
         taBuildingMapper.update(building,buildingIdQueryWrapper);
         return ResponseBean.success("");
     }
@@ -841,8 +843,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
      * @param taBuilding
      * @return
      */
-    public boolean countIsMainBuilding(TaBuilding taBuilding, Integer orgId) {
-        if (taBuilding.getIsMain() != 1){
+    public boolean publishCountIsMainBuilding(TaBuilding taBuilding, Integer orgId, Integer status) {
+        if ((status != null && status == 2) || (taBuilding.getIsMain() != null && taBuilding.getIsMain() != 1)){
             return true;
         }
         QueryWrapper<TaBuilding> taBuildingQueryWrapper = new QueryWrapper<>();
@@ -850,6 +852,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         taBuildingQueryWrapper.eq("is_main", 1);
         taBuildingQueryWrapper.eq("org_id", orgId);
         taBuildingQueryWrapper.ne("status", "-1");
+        taBuildingQueryWrapper.ne("status", "2");
         if (taBuilding.getBuildingId() != null){
             taBuildingQueryWrapper.ne("building_id", taBuilding.getBuildingId());
         }
@@ -861,6 +864,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
 
+
+
     private List<TaBuildingImg> insertImgBatch(List<TaBuildingImg> imgs, String buildingId) {
         return imgs.stream().map(img -> {
             TaBuildingImg Images = new TaBuildingImg();