bug fix

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -104,6 +104,11 @@ public class CommConstant {
      */
     public final static String POINTS_CHANGE_GROUP = "group";
 
+    /**
+     * 拼团
+     */
+    public final static String POINTS_CHANGE_HELP = "help";
+
     /**
      * 推荐客户
      */

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

@@ -9,15 +9,14 @@ import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.entity.*;
-import com.huiju.estateagents.service.IExtendContentService;
-import com.huiju.estateagents.service.ITaBuildingDynamicService;
-import com.huiju.estateagents.service.ITaBuildingService;
-import com.huiju.estateagents.service.ITdCityService;
+import com.huiju.estateagents.service.*;
+import com.huiju.estateagents.service.impl.HelpActivityServiceImpl;
 import io.jsonwebtoken.lang.Collections;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import jodd.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -62,6 +61,15 @@ public class ExtendContentController extends BaseController {
     @Autowired
     private ITdCityService iTdCityService;
 
+    @Autowired
+    private ITaNewsService iTaNewsService;
+
+    @Autowired
+    private ITaShareActivityService iTaShareActivityService;
+
+    @Autowired
+    private HelpActivityServiceImpl helpActivityService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -219,6 +227,17 @@ public class ExtendContentController extends BaseController {
             }
             extendContent.setOrgId(getOrgId(request));
 
+            iExtendContentService.judgleRelationBuildAndActivity(extendContent);
+
+            if (extendContent.getStatus() == 1){
+                boolean publishFlag = iExtendContentService.judgleRelationBuildAndActivity(extendContent);
+                if (!publishFlag){
+                    responseBean.addError("关联的项目或者活动已取消发布，上架失败");
+                    return responseBean;
+                }
+            }
+
+            //一个城市只能有一个开屏广告
             if (extendContent.getStatus() == 1 && CommConstant.OPEN_SCREEN.equals(extendContent.getShowType())){
                 QueryWrapper<ExtendContent> taExtendContentQueryWrapper = new QueryWrapper<>();
                 taExtendContentQueryWrapper.eq("city_id", extendContent.getCityId());

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

@@ -45,4 +45,6 @@ public interface IExtendContentService extends IService<ExtendContent> {
      * @param type
      */
     void updateActivity(String dynamicId, String type,Integer orgId);
+
+    boolean judgleRelationBuildAndActivity(ExtendContent extendContent);
 }

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

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.entity.ExtendContent;
-import com.huiju.estateagents.mapper.ExtendContentMapper;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.IExtendContentService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +26,17 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
 
     @Autowired
     private ExtendContentMapper extendContentMapper;
+    @Autowired
+    private TaBuildingMapper taBuildingMapper;
+    @Autowired
+    private TaBuildingDynamicMapper taBuildingDynamicMapper;
+    @Autowired
+    private TaNewsMapper taNewsMapper;
+    @Autowired
+    private HelpActivityMapper helpActivityMapper;
+    @Autowired
+    private TaShareActivityMapper taShareActivityMapper;
+
     @Override
     public ResponseBean extendContentAdd(ExtendContent extendContent) {
         ResponseBean responseBean= new ResponseBean<>();
@@ -87,4 +98,58 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
             extendContentMapper.updateById(extendContent);
         }
     }
+
+    @Override
+    public boolean judgleRelationBuildAndActivity(ExtendContent extendContent) {
+        //判断已关联的项目或者活动是否取消发布
+        if (StringUtils.isNotEmpty(extendContent.getBuildingId())){
+            QueryWrapper<TaBuilding> taBuildingQueryWrapper = new QueryWrapper<>();
+            taBuildingQueryWrapper.eq("building_id", extendContent.getBuildingId());
+            TaBuilding taBuilding = taBuildingMapper.selectOne(taBuildingQueryWrapper);
+            if (taBuilding.getStatus() == 0){
+                return false;
+            }
+        }
+
+        if (CommConstant.CAROUSEL_ACTIVITY.equals(extendContent.getContentType())
+                && StringUtils.isNotEmpty(extendContent.getTargetId())){
+            QueryWrapper<TaBuildingDynamic> taBuildingDynamicQueryWrapper = new QueryWrapper<>();
+            taBuildingDynamicQueryWrapper.eq("dynamic_id", extendContent.getTargetId());
+            TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectOne(taBuildingDynamicQueryWrapper);
+            if (taBuildingDynamic.getStatus() == 0){
+                return false;
+            }
+        }
+
+        if (CommConstant.CAROUSEL_NEWS.equals(extendContent.getContentType())
+                && StringUtils.isNotEmpty(extendContent.getTargetId())){
+            QueryWrapper<TaNews> taNewsQueryWrapper = new QueryWrapper<>();
+            taNewsQueryWrapper.eq("news_id", extendContent.getTargetId());
+            TaNews taNews = taNewsMapper.selectOne(taNewsQueryWrapper);
+            if (taNews.getNewsStatus() == 1){
+                return false;
+            }
+        }
+
+        if (CommConstant.POINTS_CHANGE_HELP.equals(extendContent.getContentType())
+                && StringUtils.isNotEmpty(extendContent.getTargetId())){
+            QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
+            helpActivityQueryWrapper.eq("help_activity_id", extendContent.getTargetId());
+            HelpActivity helpActivity = helpActivityMapper.selectOne(helpActivityQueryWrapper);
+            if (helpActivity.getStatus() == -1){
+                return false;
+            }
+        }
+
+        if (CommConstant.POINTS_CHANGE_GROUP.equals(extendContent.getContentType())
+                && StringUtils.isNotEmpty(extendContent.getTargetId())){
+            QueryWrapper<TaShareActivity> taShareActivityQueryWrapper = new QueryWrapper<>();
+            taShareActivityQueryWrapper.eq("group_activity_id", extendContent.getTargetId());
+            TaShareActivity taShareActivity = taShareActivityMapper.selectOne(taShareActivityQueryWrapper);
+            if (taShareActivity.getStatus() == -1){
+                return false;
+            }
+        }
+        return true;
+    }
 }