bug fix

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

@@ -553,8 +553,15 @@ public class HelpActivityController extends BaseController {
     public ResponseBean wxhelpActivityAndGroup(HttpServletRequest request,
                                                @RequestParam(value = "buildingId",required = false) String buildingId,
                                                @RequestParam(value = "cityId",required = false) String cityId) {
-            ResponseBean lsit = taHelpActivityService.wxhelpActivityAndGroup(getOrgId(request),buildingId,cityId);
-                return lsit;
+            String openid = getOpenId(request);
+            ResponseBean  responseBean = new ResponseBean();
+            List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+            if (null == taPersons || taPersons.size() != 1) {
+                return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            TaPerson person = taPersons.get(0);
+            ResponseBean lsit = taHelpActivityService.wxhelpActivityAndGroup(getOrgId(request),buildingId,cityId, person);
+            return lsit;
         }
 
 }

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.HelpActivity;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import com.huiju.estateagents.excel.HelpProceedAndFinish;
@@ -136,7 +137,7 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param orgId
      * @return
      */
-    ResponseBean wxhelpActivityAndGroup(Integer orgId,String buildingId,String cityID);
+    ResponseBean wxhelpActivityAndGroup(Integer orgId, String buildingId, String cityID, TaPerson person);
 
     /**
      * 列表  已开始 和 未开始

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

@@ -5,16 +5,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import com.huiju.estateagents.excel.HelpProceedAndFinish;
 import com.huiju.estateagents.excel.HelpRecordExport;
-import com.huiju.estateagents.mapper.HelpActivityMapper;
-import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
-import com.huiju.estateagents.mapper.HelpRecordMapper;
-import com.huiju.estateagents.mapper.TaShareActivityMapper;
+import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.IHelpActivityService;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +41,12 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     @Autowired
     HelpInitiateRecordMapper helpInitiateRecordMapper;
 
+    @Autowired
+    private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
+
+    @Autowired
+    private TaShareRecordMapper taShareRecordMapper;
+
     @Autowired
     HelpRecordMapper helpRecordMapper;
 
@@ -53,10 +57,10 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     TaShareActivityMapper taShareActivityMapper;
 
     @Override
-    public ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer activityStatus, Integer orgId,List<TaPersonBuilding> personBuildingList) {
+    public ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer activityStatus, Integer orgId, List<TaPersonBuilding> personBuildingList) {
         ResponseBean responseBean = new ResponseBean<>();
         IPage<HelpActivity> pg = new Page<>(pageNum, pageSize);
-        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListPage(pg, cityId, buildingId, title, startDate, endDate, activityStatus, orgId,personBuildingList);
+        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListPage(pg, cityId, buildingId, title, startDate, endDate, activityStatus, orgId, personBuildingList);
         responseBean.addSuccess(result);
         return responseBean;
     }
@@ -65,7 +69,7 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     public int helpActivityAdd(HelpActivity helpActivity, Integer orgId) {
         helpActivity.setOrgId(orgId)
                 .setCreateDate(LocalDateTime.now());
-                taHelpActivityMapper.insert(helpActivity);
+        taHelpActivityMapper.insert(helpActivity);
         return helpActivity.getHelpActivityId();
     }
 
@@ -75,7 +79,7 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public ResponseBean helpRecord(Integer helpActivityId, String status,Integer pageNum,Integer pageSize,String tel) {
+    public ResponseBean helpRecord(Integer helpActivityId, String status, Integer pageNum, Integer pageSize, String tel) {
         ResponseBean responseBean = new ResponseBean<>();
         //  status: helpSucceed助力成功，helpUnderway进行中，helpUnfinished助力失败
 
@@ -84,9 +88,9 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
         // 得到活动限制助力的总数
         int persionNumCount = helpActivity.getPersonNum();
         IPage<HelpInitiateRecord> pg = new Page<>(pageNum, pageSize);
-        IPage<HelpInitiateRecord> list = helpInitiateRecordMapper.selectPageList(pg,helpActivityId,status,tel);
+        IPage<HelpInitiateRecord> list = helpInitiateRecordMapper.selectPageList(pg, helpActivityId, status, tel);
 
-        List<HelpInitiateRecord>  helpInitiateRecordList= list.getRecords();
+        List<HelpInitiateRecord> helpInitiateRecordList = list.getRecords();
         for (HelpInitiateRecord helpInitiateRecord : helpInitiateRecordList) {
             helpInitiateRecord.setPersionNumCount(persionNumCount);
             // 统计助力成功的总数(发起人得到助力数满了即可)
@@ -127,7 +131,7 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     public ResponseBean taHelpRecordDetails(Integer helpRecordInitiateId, Integer pageNum, Integer pageSize) {
         ResponseBean responseBean = new ResponseBean<>();
         IPage<HelpInitiateRecord> pg = new Page<>(pageNum, pageSize);
-        IPage<HelpRecord> helpRecordList= helpRecordMapper.taHelpRecordDetails(pg,helpRecordInitiateId);
+        IPage<HelpRecord> helpRecordList = helpRecordMapper.taHelpRecordDetails(pg, helpRecordInitiateId);
         responseBean.addSuccess(helpRecordList);
         return responseBean;
     }
@@ -136,26 +140,26 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     public ResponseBean helpInitiateRecordVerify(Integer helpRecordInitiateId, String verifyCode) {
         ResponseBean responseBean = new ResponseBean<>();
         HelpInitiateRecord helpInitiateRecord = helpInitiateRecordMapper.selectById(helpRecordInitiateId);
-        if (null ==verifyCode || "".equals(verifyCode)){
+        if (null == verifyCode || "".equals(verifyCode)) {
             responseBean.addError("请输入核销码");
             return responseBean;
         }
 
         // 判断是否已核销
-        if ("1".equals(helpInitiateRecord.getVerificationStatus())){
+        if ("1".equals(helpInitiateRecord.getVerificationStatus())) {
             responseBean.addSuccess("已核销");
             return responseBean;
         }
 
-        if (verifyCode.equals(String.valueOf(helpInitiateRecord.getVerification()))){
+        if (verifyCode.equals(String.valueOf(helpInitiateRecord.getVerification()))) {
             helpInitiateRecord.setVerificationStatus(1);
             helpInitiateRecordMapper.updateById(helpInitiateRecord);
 
             // 活动核销加积分
-            applicationContext.publishEvent(new EventBus(helpInitiateRecord, EventBus.EventType.ActivityVerificationSign,helpInitiateRecord.getOrgId()));
+            applicationContext.publishEvent(new EventBus(helpInitiateRecord, EventBus.EventType.ActivityVerificationSign, helpInitiateRecord.getOrgId()));
 
             responseBean.addSuccess("成功");
-        }else {
+        } else {
             responseBean.addError("核销码错误,请重新输入");
         }
         return responseBean;
@@ -163,34 +167,34 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
 
     @Override
     public Integer getHelpInitiateRecordSucceed(String tel, Integer helpActivityId) {
-        QueryWrapper<HelpInitiateRecord> helpInitiateRecordQuery= new QueryWrapper<>();
-        helpInitiateRecordQuery.eq("help_activity_id",helpActivityId);
-        helpInitiateRecordQuery.eq(!StringUtils.isEmpty(tel), "phone",tel);
+        QueryWrapper<HelpInitiateRecord> helpInitiateRecordQuery = new QueryWrapper<>();
+        helpInitiateRecordQuery.eq("help_activity_id", helpActivityId);
+        helpInitiateRecordQuery.eq(!StringUtils.isEmpty(tel), "phone", tel);
         return helpInitiateRecordMapper.selectCount(helpInitiateRecordQuery);
     }
 
     @Override
     public List<HelpInitiateRecordSucceed> getHelpInitiateRecordSucceedExportList(int i, Integer pageSize, String tel, Integer helpActivityId) {
-         List<HelpInitiateRecordSucceed> lsit= helpInitiateRecordMapper.getHelpInitiateRecordSucceedExportList(i,pageSize,tel,helpActivityId);
+        List<HelpInitiateRecordSucceed> lsit = helpInitiateRecordMapper.getHelpInitiateRecordSucceedExportList(i, pageSize, tel, helpActivityId);
         return lsit;
     }
 
     @Override
-    public List<HelpProceedAndFinish> getHelpProceedAndFinishExportList(int i, Integer pageSize, String tel, Integer helpActivityId,String condition) {
-        List<HelpProceedAndFinish> lsit= helpInitiateRecordMapper.getHelpProceedAndFinishExportList(i,pageSize,tel,helpActivityId,condition);
+    public List<HelpProceedAndFinish> getHelpProceedAndFinishExportList(int i, Integer pageSize, String tel, Integer helpActivityId, String condition) {
+        List<HelpProceedAndFinish> lsit = helpInitiateRecordMapper.getHelpProceedAndFinishExportList(i, pageSize, tel, helpActivityId, condition);
         return lsit;
     }
 
     @Override
     public Integer getHelpRecord(Integer helpRecordInitiateId) {
-        QueryWrapper<HelpRecord> helpInitiateRecordQuery= new QueryWrapper<>();
-        helpInitiateRecordQuery.eq("help_record_initiate_id",helpRecordInitiateId);
+        QueryWrapper<HelpRecord> helpInitiateRecordQuery = new QueryWrapper<>();
+        helpInitiateRecordQuery.eq("help_record_initiate_id", helpRecordInitiateId);
         return helpRecordMapper.selectCount(helpInitiateRecordQuery);
     }
 
     @Override
     public List<HelpRecordExport> getHelpRecordExportList(int i, Integer pageSize, Integer helpRecordInitiateId) {
-        List<HelpRecordExport> lsit= helpRecordMapper.getHelpRecordExportList(i,pageSize,helpRecordInitiateId);
+        List<HelpRecordExport> lsit = helpRecordMapper.getHelpRecordExportList(i, pageSize, helpRecordInitiateId);
         return lsit;
     }
 
@@ -210,19 +214,56 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public ResponseBean wxhelpActivityAndGroup(Integer orgId,String buildingId,String cityID) {
+    public ResponseBean wxhelpActivityAndGroup(Integer orgId, String buildingId, String cityID, TaPerson person) {
         ResponseBean responseBean = new ResponseBean<>();
+        //查询是否报名了普通活动
+        QueryWrapper<TaActivityDynamicEnlist> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", orgId);
+        queryWrapper.eq("person_id", person.getPersonId());
+        List<TaActivityDynamicEnlist> taActivityDynamicEnlists = taActivityDynamicEnlistMapper.selectList(queryWrapper);
+        //查询是否报名了拼团活动
+        QueryWrapper<TaShareRecord> taShareRecordQueryWrapper = new QueryWrapper<>();
+        taShareRecordQueryWrapper.eq("org_id", orgId);
+        taShareRecordQueryWrapper.eq("person_id", person.getPersonId());
+        List<TaShareRecord> taShareRecords = taShareRecordMapper.selectList(taShareRecordQueryWrapper);
+        //判断是否发起了助力活动
+        QueryWrapper<HelpInitiateRecord> helpInitiateRecordListQueryWrapper = new QueryWrapper<>();
+        helpInitiateRecordListQueryWrapper.eq("org_id", orgId);
+        helpInitiateRecordListQueryWrapper.eq("person_id", person.getPersonId());
+        List<HelpInitiateRecord> helpInitiateRecords = helpInitiateRecordMapper.selectList(helpInitiateRecordListQueryWrapper);
+
         // buildingId 楼盘ID为空时首页只查置顶的活动，楼盘ID不为空查所有拼团和助力
-        List<HelpActivity> HelpActivity = taHelpActivityMapper.selectWxhelpActivityAndGroup(orgId,buildingId,cityID);
-        responseBean.addSuccess(HelpActivity);
+        List<HelpActivity> helpActivities = taHelpActivityMapper.selectWxhelpActivityAndGroup(orgId, buildingId, cityID);
+        for (HelpActivity helpActivity : helpActivities) {
+            if ("activity".equals(helpActivity.getType())) {
+                taActivityDynamicEnlists.forEach(dynamic -> {
+                    if (helpActivity.getActivityId().equals(dynamic.getDynamicId())) {
+                        helpActivity.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
+                    }
+                });
+            } else if ("group".equals(helpActivity.getType())) {
+                taShareRecords.forEach(share -> {
+                    if (helpActivity.getActivityId().equals(share.getGroupActivityId().toString())) {
+                        helpActivity.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
+                    }
+                });
+            } else if ("help".equals(helpActivity.getType())) {
+                helpInitiateRecords.forEach(help -> {
+                    if (helpActivity.getActivityId().equals(help.getHelpActivityId().toString())) {
+                        helpActivity.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
+                    }
+                });
+            }
+        }
+        responseBean.addSuccess(helpActivities);
         return responseBean;
     }
 
     @Override
-    public ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId,Integer status,String name,List<TaPersonBuilding> personBuildingList) {
+    public ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId, Integer status, String name, List<TaPersonBuilding> personBuildingList) {
         ResponseBean responseBean = new ResponseBean<>();
         IPage<HelpActivity> pg = new Page<>(pageNum, pageSize);
-        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListEffectivePage(pg, cityId, orgId, buildingId,status,name,personBuildingList);
+        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListEffectivePage(pg, cityId, orgId, buildingId, status, name, personBuildingList);
         responseBean.addSuccess(result);
         return responseBean;
     }

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

@@ -67,13 +67,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     TdCityMapper tdCityMapper;
 
     @Autowired
-    private TaBuildingProjectTypeMapper taBuildingProjectTypeMapper;
+    private TaGoodsMapper taGoodsMapper;
 
     @Autowired
-    private TaPosterService taPosterService;
+    private TaNewsMapper taNewsMapper;
 
     @Autowired
-    private TaShareContentService taShareContentService;
+    private TaBuildingDynamicMapper taBuildingDynamicMapper;
 
     @Autowired
     private HelpActivityMapper helpActivityMapper;
@@ -81,6 +81,18 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private TaShareActivityMapper taShareActivityMapper;
 
+    @Autowired
+    private TaExtendContentMapper taExtendContentMapper;
+
+    @Autowired
+    private TaBuildingProjectTypeMapper taBuildingProjectTypeMapper;
+
+    @Autowired
+    private TaPosterService taPosterService;
+
+    @Autowired
+    private TaShareContentService taShareContentService;
+
     @Autowired
     private  TaOrgMapper  taOrgMapper;
 
@@ -355,6 +367,48 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             TdCity city = tdCityMapper.selectById(building.getCityId());
             city.setStatus("1");
             tdCityMapper.updateById(city);
+
+            //更新商品城市
+            TaGoods taGoods = new TaGoods();
+            taGoods.setCityId(building.getCityId());
+            QueryWrapper<TaGoods> goodsQueryWrapper = new QueryWrapper<>();
+            goodsQueryWrapper.eq("building_id", building.getBuildingId());
+            taGoodsMapper.update(taGoods, goodsQueryWrapper);
+
+            //更新资讯城市
+            TaNews taNews = new TaNews();
+            taNews.setCityId(building.getCityId());
+            QueryWrapper<TaNews> newsQueryWrapper = new QueryWrapper<>();
+            newsQueryWrapper.eq("building_id", building.getBuildingId());
+            taNewsMapper.update(taNews, newsQueryWrapper);
+
+            //更新活动城市
+            TaBuildingDynamic taBuildingDynamic = new TaBuildingDynamic();
+            taBuildingDynamic.setCityId(building.getCityId());
+            QueryWrapper<TaBuildingDynamic> taBuildingDynamicQueryWrapper = new QueryWrapper<>();
+            taBuildingDynamicQueryWrapper.eq("building_id", building.getBuildingId());
+            taBuildingDynamicMapper.update(taBuildingDynamic, taBuildingDynamicQueryWrapper);
+
+            //更新助力城市
+            HelpActivity helpActivity = new HelpActivity();
+            helpActivity.setCityId(building.getCityId());
+            QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
+            helpActivityQueryWrapper.eq("building_id", building.getBuildingId());
+            helpActivityMapper.update(helpActivity, helpActivityQueryWrapper);
+
+            //更新拼团城市
+            TaShareActivity taShareActivity = new TaShareActivity();
+            taShareActivity.setCityId(building.getCityId());
+            QueryWrapper<TaShareActivity> taShareActivityQueryWrapper = new QueryWrapper<>();
+            taShareActivityQueryWrapper.eq("building_id", building.getBuildingId());
+            taShareActivityMapper.update(taShareActivity, taShareActivityQueryWrapper);
+
+            //更新首页轮播、开屏广告、宣传位
+            TaExtendContent taExtendContent = new TaExtendContent();
+            taExtendContent.setCityId(building.getCityId());
+            QueryWrapper<TaExtendContent> taExtendContentQueryWrapper = new QueryWrapper<>();
+            taExtendContentQueryWrapper.eq("building_id", building.getBuildingId());
+            taExtendContentMapper.update(taExtendContent, taExtendContentQueryWrapper);
         }
 
         // 项目类型