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

src/main/java/com/huiju/estateagents/activity/service/impl/ActivityServiceImpl.java

@@ -59,16 +59,16 @@ public class ActivityServiceImpl implements ActivityServiceI {
 		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<HelpRecord> helpRecordQueryWrapper = new QueryWrapper<>();
-		helpRecordQueryWrapper.eq("org_id",orgId);
-		helpRecordQueryWrapper.eq("person_id",person.getPersonId());
-		List<HelpRecord> helpRecords = helpRecordMapper.selectList(helpRecordQueryWrapper);
+		QueryWrapper<HelpInitiateRecord> helpInitiateRecordListQueryWrapper = new QueryWrapper<>();
+		helpInitiateRecordListQueryWrapper.eq("org_id",orgId);
+		helpInitiateRecordListQueryWrapper.eq("person_id",person.getPersonId());
+		List<HelpInitiateRecord> HelpInitiateRecords = helpInitiateRecordMapper.selectList(helpInitiateRecordListQueryWrapper);
 		
 		//分页获取全部数据
 		Page pg = new Page(pageNumber,pageSize);
@@ -95,7 +95,7 @@ public class ActivityServiceImpl implements ActivityServiceI {
 				List<TaShareRecord> taShareRecordsList = taShareRecordMapper.selectList(shareRecordQueryWrapper);
 				e.setSuccessNum(taShareRecordsList.size());
 			}else if (e.getType().equals("help")){
-				helpRecords.forEach(help -> {
+				HelpInitiateRecords.forEach(help -> {
 					if (e.getId().equals(help.getHelpActivityId())){
 						e.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
 					}

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

@@ -429,4 +429,22 @@ public class CommConstant {
 	public static final Object GROUP_ACTIVITY = "groupActivity";
 	public static final String TARGET_TYPE_H5 = "H5";
     public static final String ACTIVITY_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/checkin/index\"}";
+    
+    /**
+     * 消息通知
+     * 必须存在表   td_miniapp_template_type 中
+     */
+    public static final String MINIAPP_TPL_NOTICE = "notice";
+    
+    /**
+     * 助力通知
+     * 必须存在表   td_miniapp_template_type 中
+     */
+    public static final String MINIAPP_TPL_HELP = "help.result";
+    
+    /**
+     * 拼团通知
+     * 必须存在表   td_miniapp_template_type 中
+     */
+    public static final String MINIAPP_TPL_GROUP = "group.result";
 }

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

@@ -472,6 +472,11 @@ public class HelpActivityController extends BaseController {
                 helpRecordQueryWrapper.eq("help_activity_id",helpActivity.getHelpActivityId());
                 helpRecordQueryWrapper.eq("help_record_initiate_id",helpInitiateRecord.getHelpRecordInitiateId());
                 List<HelpRecord> helpRecordList = helpRecordService.list(helpRecordQueryWrapper);
+                helpRecordList.forEach(e -> {
+                    if (e.getPersonId().equals(person.getPersonId())){
+                        map.put("isJoin",true);
+                    }
+                });
         
                 map.put("helpInitiateRecord",helpInitiateRecord);
                 map.put("helpRecordList",helpRecordList);

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

@@ -356,20 +356,23 @@ public class MiniAppController extends BaseController {
 //            if(list.size()<=0){
 //                taCustomerPersonService.insertBean(person.getPersonId(),customers.getCustomerId());
 //            }
+        }else{
+            TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
+            taRecommendCustomer.setPersonId(person.getPersonId());
+            taRecommendCustomer.setPicture(person.getAvatarurl());
+            taRecommendCustomer.setCountry(person.getCountry());
+            taRecommendCustomer.setCity(person.getCity());
+            taRecommendCustomer.setProvince(person.getProvince());
+            taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+            taRecommendCustomer.setOrgId(getOrgId(request));
+            taRecommendCustomer.setEntryType(CommConstant.ENTRY_VOLUNTEER);
+            taRecommendCustomer.setSex(Integer.getInteger(person.getGender()));
+            taRecommendCustomer.setName(person.getNickname());
+            taRecommendCustomer.setPhone(person.getPhone());
+            taRecommendCustomer.setCreateDate(LocalDateTime.now());
+            taRecommendCustomerService.save(taRecommendCustomer);
         }
-//        else{
-//            TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
-//            taRecommendCustomer.setPersonId(person.getPersonId());
-//            taRecommendCustomer.setPicture(person.getAvatarurl());
-//            taRecommendCustomer.setCountry(person.getCountry());
-//            taRecommendCustomer.setCity(person.getCity());
-//            taRecommendCustomer.setProvince(person.getProvince());
-//            taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
-//            taRecommendCustomer.setOrgId(getOrgId(request));
-//            taRecommendCustomer.setEntryType(CommConstant.ENTRY_VOLUNTEER);
-//            taRecommendCustomer.setSex(Integer.getInteger(person.getGender()));
-//
-//        }
+
         return ResponseBean.success(phoneNoInfo);
     }
 

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

@@ -348,6 +348,11 @@ public class TaShareActivityController extends BaseController {
                 childRecordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActivityId());
                 childRecordQueryWrapper.eq("record_id",taShareRecord.getRecordId());
                 List<TaShareChildRecord> shareChildRecordList = taShareChildRecordService.list(childRecordQueryWrapper);
+                shareChildRecordList.forEach(e -> {
+                    if (e.getPersonId().equals(person.getPersonId())){
+                        map.put("isJoin",true);
+                    }
+                });
                 map.put("shareChildRecordList",shareChildRecordList);
             }
     

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

@@ -82,7 +82,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
         data.add(new WxMaTemplateData("keyword3", content, "#fffff"));
         data.add(new WxMaTemplateData("keyword4", DateUtils.cutSecond(dt), "#fffff"));
 
-        sendMessage("notice", toUser, link, data);
+        sendMessage(CommConstant.MINIAPP_TPL_NOTICE, toUser, link, data);
     }
     
     @Override
@@ -92,7 +92,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
         data.add(new WxMaTemplateData("keyword2", activityName, "#fffff"));
         data.add(new WxMaTemplateData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
         
-        sendMessage("help.result", toUser, link, data);
+        sendMessage(CommConstant.MINIAPP_TPL_HELP, toUser, link, data);
     }
     
     @Override
@@ -102,7 +102,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
         data.add(new WxMaTemplateData("keyword2", activityName, "#fffff"));
         data.add(new WxMaTemplateData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
         
-        sendMessage("group.result", toUser, link, data);
+        sendMessage(CommConstant.MINIAPP_TPL_GROUP, toUser, link, data);
     }
 
     @Override