合并

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

@@ -440,11 +440,11 @@ public class CommConstant {
      * 助力通知
      * 必须存在表   td_miniapp_template_type 中
      */
-    public static final String MINIAPP_TPL_HELP = "help.result";
+    public static final String MINIAPP_TPL_HELP = "help-result";
     
     /**
      * 拼团通知
      * 必须存在表   td_miniapp_template_type 中
      */
-    public static final String MINIAPP_TPL_GROUP = "group.result";
+    public static final String MINIAPP_TPL_GROUP = "group-result";
 }

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

@@ -520,7 +520,7 @@ public class HelpActivityController extends BaseController {
     })
     @RequestMapping(value = "/wx/helpActivityAndGroup", method = RequestMethod.GET)
     public ResponseBean wxhelpActivityAndGroup(HttpServletRequest request,
-                                               @RequestParam(value = "buildingId",required = false) Integer buildingId,
+                                               @RequestParam(value = "buildingId",required = false) String buildingId,
                                                @RequestParam(value = "type",required = false)Integer type) {
             ResponseBean lsit = taHelpActivityService.wxhelpActivityAndGroup(getOrgId(request),type,buildingId);
                 return lsit;

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

@@ -200,8 +200,23 @@ public class TaBuildingDynamicController extends BaseController {
                 QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
                 buildingDynamicQueryWrapper.in("dynamic_id",ids);
                 IPage<TaBuildingDynamic> buildingDynamicIPage = iBuildingDynamicService.page(page,buildingDynamicQueryWrapper);
+    
+                //查询是否报名了普通活动
+                QueryWrapper<TaActivityDynamicEnlist> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("org_id",getOrgId(request));
+                queryWrapper.eq("person_id",person.getPersonId());
+                List<TaActivityDynamicEnlist> taActivityDynamicEnlists = taActivityDynamicEnlistMapper.selectList(queryWrapper);
+                
                 for(int j=0;j<buildingDynamicIPage.getRecords().size();j++){
                     iBuildingDynamicService.setExtendInfo(buildingDynamicIPage.getRecords().get(j),person);
+                    
+                    //是否已参与状态
+                    TaBuildingDynamic taBuildingDynamic = buildingDynamicIPage.getRecords().get(j);
+                    taActivityDynamicEnlists.forEach(dynamic -> {
+                        if (taBuildingDynamic.getDynamicId().equals(dynamic.getDynamicId())){
+                            taBuildingDynamic.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
+                        }
+                    });
                 }
                 responseBean.addSuccess(buildingDynamicIPage);
             }else {

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

@@ -131,7 +131,7 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param orgId
      * @return
      */
-    ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,Integer buildingId);
+    ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,String buildingId);
 
     /**
      * 列表  已开始 和 未开始

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

@@ -211,7 +211,7 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,Integer buildingId) {
+    public ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,String buildingId) {
         ResponseBean responseBean = new ResponseBean<>();
         // 根据楼盘id查助力
         if ("1".equals(type)){

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

@@ -134,6 +134,9 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         buildingDynamicQueryWrapper.eq("dynamic_id", dynamicId);
         buildingDynamicQueryWrapper.eq("status",1);
         TaBuildingDynamic tabuildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
+        if (null == tabuildingDynamic){
+            return ResponseBean.error("当前活动已失效", ResponseBean.ERROR_UNAVAILABLE);
+        }
         // 当前阅读量加1
         Integer saveNum = tabuildingDynamic.getPvNum() == null ? 1:tabuildingDynamic.getPvNum()+1;
         tabuildingDynamic.setPvNum(saveNum);