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

src/main/java/com/huiju/estateagents/activity/entity/Activity.java

@@ -29,4 +29,9 @@ public class Activity {
 	private Integer activityStatus;
 	
 	private String type;
+	
+	/**
+	 * 完成数量
+	 */
+	private Integer successNum;
 }

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

@@ -7,10 +7,12 @@ import com.huiju.estateagents.activity.mapper.ActivityMapper;
 import com.huiju.estateagents.activity.service.ActivityServiceI;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.HelpInitiateRecord;
 import com.huiju.estateagents.entity.HelpRecord;
 import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaShareRecord;
+import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
 import com.huiju.estateagents.mapper.HelpRecordMapper;
 import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
 import com.huiju.estateagents.mapper.TaShareRecordMapper;
@@ -38,6 +40,9 @@ public class ActivityServiceImpl implements ActivityServiceI {
 	@Autowired
 	private HelpRecordMapper helpRecordMapper;
 	
+	@Autowired
+	private HelpInitiateRecordMapper helpInitiateRecordMapper;
+	
 	/**
 	 * 获取三个活动
 	 *
@@ -75,18 +80,33 @@ public class ActivityServiceImpl implements ActivityServiceI {
 						e.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
 					}
 				});
-			}else if (e.getType().equals("share")){
+				e.setSuccessNum(null);
+			}else if (e.getType().equals("group")){
 				taShareRecords.forEach(share -> {
 					if (e.getId().equals(share.getGroupActivityId())){
 						e.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
 					}
 				});
+				//查看此活动已经完成的数量
+				QueryWrapper<TaShareRecord> shareRecordQueryWrapper = new QueryWrapper<>();
+				shareRecordQueryWrapper.eq("org_id",orgId);
+				shareRecordQueryWrapper.eq("group_activity_id",e.getId());
+				shareRecordQueryWrapper.eq("status",CommConstant.STATUS_UNACCALIMED);
+				List<TaShareRecord> taShareRecordsList = taShareRecordMapper.selectList(shareRecordQueryWrapper);
+				e.setSuccessNum(taShareRecordsList.size());
 			}else if (e.getType().equals("help")){
 				helpRecords.forEach(help -> {
 					if (e.getId().equals(help.getHelpActivityId())){
 						e.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
 					}
 				});
+				//查看此活动已经完成的数量
+				QueryWrapper<HelpInitiateRecord> helpInitiateRecordQueryWrapper = new QueryWrapper<>();
+				helpInitiateRecordQueryWrapper.eq("org_id",orgId);
+				helpInitiateRecordQueryWrapper.eq("help_activity_id",e.getId());
+				helpInitiateRecordQueryWrapper.eq("status",CommConstant.STATUS_UNACCALIMED);
+				List<HelpInitiateRecord> helpInitiateRecordList = helpInitiateRecordMapper.selectList(helpInitiateRecordQueryWrapper);
+				e.setSuccessNum(helpInitiateRecordList.size());
 			}
 		});
 		pg.setRecords(list);

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

@@ -104,6 +104,16 @@ public class CommConstant {
      */
     public final static String POINTS_CHANGE_RECOMMEND_CUSTOMER = "recommend-customer";
 
+    /**
+     * 活动核销
+     */
+    public final static String POINTS_CHANGE_ACTIVITY_VERIFICATION = "activity_verification";
+
+    /**
+     * 资料审核
+     */
+    public final static String POINTS_CHANGE_DOCUMENT_VERIFY = "document_verify";
+
 
     /**
      * 小程序默认首页
@@ -265,6 +275,16 @@ public class CommConstant {
      */
     public static final Integer POINTS_RULE_SIGNUP_AGENT = 4;
 
+    /**
+     * 活动核销送积分规则
+     */
+    public static final Integer POINTS_RULE_ACTIVITY_VERIFICATION = 6;
+
+    /**
+     * 资料审核送积分规则
+     */
+    public static final Integer POINTS_RULE_DOCUMENT_VERIFY = 7;
+
     /**
      * 平台积分
      */

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

@@ -400,30 +400,50 @@ public class HelpActivityController extends BaseController {
                                           @RequestParam(value = "initiateId",required = false) Integer initiateId,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
-        
+        String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
         Map<String,Object> map = new HashMap<>();
         try {
             //活动信息
             HelpActivity helpActivity = taHelpActivityService.getById(helpActivityId);
+            QueryWrapper<HelpInitiateRecord> helpInitiateRecordQueryWrapper = new QueryWrapper<>();
+            helpInitiateRecordQueryWrapper.eq("org_id",orgId);
+            helpInitiateRecordQueryWrapper.eq("help_activity_id",helpActivity.getHelpActivityId());
+            helpInitiateRecordQueryWrapper.eq("status",CommConstant.STATUS_UNACCALIMED);
+            List<HelpInitiateRecord> helpInitiateRecordList = helpInitiateRecordMapper.selectList(helpInitiateRecordQueryWrapper);
+            helpActivity.setSuccessNum(helpInitiateRecordList.size());
             map.put("helpActivity",helpActivity);
             
             //发起者信息
+            HelpInitiateRecord helpInitiateRecord = null;
              if (null != initiateId){
-                 HelpInitiateRecord helpInitiateRecord = helpInitiateRecordService.getById(initiateId);
-                 if (null != helpInitiateRecord){
-                     helpActivity.setHelpStatus(CommConstant.HELP_STATUS_INITIATE);
+                 helpInitiateRecord = helpInitiateRecordService.getById(initiateId);
+             }else {
+                 QueryWrapper<HelpInitiateRecord> initiateRecordQueryWrapper = new QueryWrapper<>();
+                 initiateRecordQueryWrapper.eq("org_id",orgId);
+                 initiateRecordQueryWrapper.eq("help_activity_id",helpActivity.getHelpActivityId());
+                 initiateRecordQueryWrapper.eq("person_id",person.getPersonId());
+                 helpInitiateRecord = helpInitiateRecordService.getOne(initiateRecordQueryWrapper);
+             }
+             
+             //判断是否发起者
+            if (null != helpInitiateRecord){
+                helpActivity.setHelpStatus(CommConstant.HELP_STATUS_INITIATE);
         
-                     //助力者信息
-                     QueryWrapper<HelpRecord> helpRecordQueryWrapper = new QueryWrapper<>();
-                     helpRecordQueryWrapper.eq("org_id",orgId);
-                     helpRecordQueryWrapper.eq("help_activity_id",helpActivity.getHelpActivityId());
-                     helpRecordQueryWrapper.eq("help_record_initiate_id",helpInitiateRecord.getHelpRecordInitiateId());
-                     List<HelpRecord> helpRecordList = helpRecordService.list(helpRecordQueryWrapper);
+                //助力者信息
+                QueryWrapper<HelpRecord> helpRecordQueryWrapper = new QueryWrapper<>();
+                helpRecordQueryWrapper.eq("org_id",orgId);
+                helpRecordQueryWrapper.eq("help_activity_id",helpActivity.getHelpActivityId());
+                helpRecordQueryWrapper.eq("help_record_initiate_id",helpInitiateRecord.getHelpRecordInitiateId());
+                List<HelpRecord> helpRecordList = helpRecordService.list(helpRecordQueryWrapper);
         
-                     map.put("helpInitiateRecord",helpInitiateRecord);
-                     map.put("helpRecordList",helpRecordList);
-                 }
-             }
+                map.put("helpInitiateRecord",helpInitiateRecord);
+                map.put("helpRecordList",helpRecordList);
+            }
     
             //获取海报信息
             QueryWrapper<TaPoster> posterQueryWrapper = new QueryWrapper<>();

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

@@ -10,12 +10,14 @@ import com.huiju.estateagents.entity.TaApartmentImg;
 import com.huiju.estateagents.entity.TaDocumentImg;
 import com.huiju.estateagents.entity.TaDocumentVerify;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.service.ITaDocumentImgService;
 import com.huiju.estateagents.service.ITaDocumentVerifyService;
 import com.huiju.estateagents.service.ITaPersonService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -49,6 +51,9 @@ public class TaDocumentVerifyController extends BaseController {
     public ITaDocumentImgService documentImgService;
 
 
+    @Autowired
+    private ApplicationContext applicationContext;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -140,7 +145,7 @@ public class TaDocumentVerifyController extends BaseController {
     }
 
     /**
-     * 修改对象
+     * 微信修改对象
      * @param id  实体ID
      * @param list List<TaDocumentImg>
      * @return
@@ -200,7 +205,18 @@ public class TaDocumentVerifyController extends BaseController {
             documentVerify.setVerifyUser(person.getUserId().toString());
         }
         try {
+            documentVerify.setDocumentVerifyId(id);
             if (iTaDocumentVerifyService.updateById(documentVerify)){
+
+                if (null != documentVerify.getVerifyStatus() && documentVerify.getVerifyStatus().intValue() == 1) {
+                    // 活动核销加积分
+                    TaDocumentVerify verify = iTaDocumentVerifyService.getById(documentVerify.getDocumentVerifyId());
+
+                    // 资料审核加积分
+                    applicationContext.publishEvent(new EventBus(verify, EventBus.EventType.DocumentVerify,verify.getOrgId()));
+
+                }
+
                 responseBean.addSuccess(documentVerify);
             }else {
                 responseBean.addError("fail");
@@ -217,7 +233,7 @@ public class TaDocumentVerifyController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/documentVerify/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/documentVerify/{id}",method= RequestMethod.GET)
     public ResponseBean documentVerifyGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {

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

@@ -13,10 +13,13 @@ import com.huiju.estateagents.entity.TaShareActivity;
 import com.huiju.estateagents.entity.TaShareChildRecord;
 import com.huiju.estateagents.entity.TaShareContent;
 import com.huiju.estateagents.entity.TaShareRecord;
+import com.huiju.estateagents.service.*;
+import com.huiju.estateagents.entity.TdPosterTemplate;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaShareActivityService;
 import com.huiju.estateagents.service.ITaShareChildRecordService;
 import com.huiju.estateagents.service.ITaShareRecordService;
+import com.huiju.estateagents.service.ITdPosterTemplateService;
 import com.huiju.estateagents.service.TaPosterService;
 import com.huiju.estateagents.service.TaShareContentService;
 import io.swagger.models.auth.In;
@@ -61,6 +64,12 @@ public class TaShareActivityController extends BaseController {
     
     @Autowired
     private TaShareContentService taShareContentService;
+
+    @Autowired
+    private ITaBuildingService iTaBuildingService;
+    
+    @Autowired
+    private ITdPosterTemplateService tdPosterTemplateService;
     
 
     /**
@@ -74,11 +83,12 @@ public class TaShareActivityController extends BaseController {
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                             @RequestParam(value ="buildingId",required = false) String buildingId,
                                             @RequestParam(value ="activityName",required = false) String activityName,
-                                            @RequestParam(value ="status",required = false) String status,
+                                            @RequestParam(value ="activityStatus",required = false) String activityStatus,
+                                            @RequestParam(value ="cityId",required = false)Integer cityId,
                                             HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaShareActivityService.getList(pageNum, pageSize, buildingId, activityName, status, null, null, getOrgId(request));
+            responseBean = iTaShareActivityService.getList(pageNum, pageSize, buildingId, activityName, activityStatus, null, null, cityId, getOrgId(request));
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taShareActivityList -=- {}",e.toString());
@@ -97,6 +107,8 @@ public class TaShareActivityController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
+            Integer cityId = iTaBuildingService.getCityById(taShareActivity.getBuildingId());
+            taShareActivity.setCityId(cityId);
             taShareActivity.setOrgId(getOrgId(request));
             taShareActivity.setStatus(0);
             taShareActivity.setActivityStatus(1);
@@ -275,6 +287,13 @@ public class TaShareActivityController extends BaseController {
         try {
             //活动详情
             TaShareActivity taShareActivity = iTaShareActivityService.getById(groupActicityId);
+            //查看此活动已经完成的数量
+            QueryWrapper<TaShareRecord> shareRecordQueryWrapper = new QueryWrapper<>();
+            shareRecordQueryWrapper.eq("org_id",orgId);
+            shareRecordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActicityId());
+            shareRecordQueryWrapper.eq("status",CommConstant.STATUS_UNACCALIMED);
+            List<TaShareRecord> taShareRecordsList = taShareRecordService.list(shareRecordQueryWrapper);
+            taShareActivity.setSuccessNum(taShareRecordsList.size());
             map.put("taShareActivity",taShareActivity);
             
             //发起者团长信息
@@ -304,6 +323,13 @@ public class TaShareActivityController extends BaseController {
             List<TaPoster> postList = taPosterService.list(posterQueryWrapper);
             map.put("postList",postList);
     
+            QueryWrapper<TdPosterTemplate> tdPosterTemplateQueryWrapper = new QueryWrapper<>();
+            tdPosterTemplateQueryWrapper.eq("org_id",orgId);
+            tdPosterTemplateQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+            tdPosterTemplateQueryWrapper.eq("type",CommConstant.GROUP_ACTIVITY);
+            List<TdPosterTemplate> posterTemplateList = tdPosterTemplateService.list(tdPosterTemplateQueryWrapper);
+            map.put("posterTemplateList",posterTemplateList);
+    
             //获取分享信息
             QueryWrapper<TaShareContent> taShareContentQueryWrapper = new QueryWrapper<>();
             taShareContentQueryWrapper.eq("share_content_type",CommConstant.GROUP_ACTIVITY);

src/main/java/com/huiju/estateagents/entity/HelpActivity.java

@@ -120,4 +120,15 @@ public class HelpActivity implements Serializable {
     @TableField(exist = false)
     private String helpStatus;
 
+    /**
+     * 发起成功的总数
+     */
+    @TableField(exist = false)
+    private String succeedCount;
+    
+    /**
+     * 助力成功次数
+     */
+    @TableField(exist = false)
+    private Integer successNum;
 }

src/main/java/com/huiju/estateagents/entity/TaDocumentImg.java

@@ -1,5 +1,7 @@
 package com.huiju.estateagents.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -27,6 +29,7 @@ public class TaDocumentImg implements Serializable {
     /**
      * 编号
      */
+    @TableId(value = "document_img_id", type = IdType.AUTO)
     private Integer documentImgId;
 
     /**

src/main/java/com/huiju/estateagents/entity/TaShareActivity.java

@@ -80,6 +80,11 @@ public class TaShareActivity implements Serializable {
      */
     private String descImg;
 
+    /**
+     * 城市id
+     */
+    private Integer cityId;
+
     /**
      * 分享id
      */
@@ -121,4 +126,10 @@ public class TaShareActivity implements Serializable {
      */
     @TableField(exist = false)
     private Integer averageScore;
+    
+    /**
+     * 助力成功次数
+     */
+    @TableField(exist = false)
+    private Integer successNum;
 }

src/main/java/com/huiju/estateagents/event/EventBus.java

@@ -33,7 +33,13 @@ public class EventBus extends ApplicationEvent {
 		SignUpAgent(4),
 
 		// 没有限制的 分享海报加积分
-		SharePosterAll(5);
+		SharePosterAll(5),
+
+		// 活动核销签到
+		ActivityVerificationSign(6),
+
+		// 资料审核成功
+		DocumentVerify(6);
 
 		private Integer type;
 

src/main/java/com/huiju/estateagents/event/EventLisenter.java

@@ -1,9 +1,6 @@
 package com.huiju.estateagents.event;
 
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaPersonSign;
-import com.huiju.estateagents.entity.TaRecommendCustomer;
-import com.huiju.estateagents.entity.TaShare;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.service.ITaPointsRecordsService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +41,15 @@ public class EventLisenter {
 			case SharePosterAll:
 				getSharePointsAll((String) event.getSource(), event.getOrgId());
 				break;
+
+			// 活动核销签到
+			case ActivityVerificationSign:
+				getActivityVerificationSign((HelpInitiateRecord) event.getSource(), event.getOrgId());
+				break;
+			// 资料审核成功
+			case DocumentVerify:
+				getDocumentVerify((TaDocumentVerify) event.getSource(), event.getOrgId());
+				break;
 			default:
 				break;
 		}
@@ -67,4 +73,18 @@ public class EventLisenter {
 
 	// 推荐客户送积分
 	private void getRecommendCustPoints(TaRecommendCustomer taRecommendCustomer, Integer orgId) { taPointsRecordsService.recommendCustPoints(taRecommendCustomer, orgId); }
+
+	/**
+	 * 活动核销成功送积分
+	 */
+	private void getActivityVerificationSign(HelpInitiateRecord helpInitiateRecord, Integer orgId) {
+		taPointsRecordsService.activityVerificationSign(helpInitiateRecord, orgId);
+	}
+
+	/**
+	 * 资料审核成功送积分
+	 */
+	private void getDocumentVerify(TaDocumentVerify taDocumentVerify, Integer orgId) {
+		taPointsRecordsService.documentVerify(taDocumentVerify, orgId);
+	}
 }

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

@@ -24,6 +24,10 @@ public interface IMiniAppService {
     WxMaPhoneNumberInfo getPhoneNoInfo(String sessionKey, String encryptedData, String iv, String appid);
 
     void sendNoticeMessage(TaPerson toUser, String link, String name, String phone, String content, LocalDateTime dt);
+    
+    void sendHelpMessage(TaPerson toUser, String link, String result, String activityName, LocalDateTime dt);
+    
+    void sendGroupMessage(TaPerson toUser, String link, String result, String activityName, LocalDateTime dt);
 
     void sendMainBizMessage(TaPerson toUser, String link, String custName, String phone, String sex, String fromName, String bizType, String content);
 

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

@@ -14,12 +14,16 @@ import com.huiju.estateagents.entity.*;
  */
 public interface ITaPointsRecordsService extends IService<TaPointsRecords> {
 
+	// 分享赚积分
 	void sharePoints(TaShare taShare, Integer orgId);
 
+	// 签到赚积分
 	void checkinPoints(TaPersonSign taPersonSign, Integer orgId);
 
+	// 注册送积分
 	void signUpPoints(TaPerson taPerson, Integer orgId);
 
+	// 推荐客户送积分
 	void recommendCustPoints(TaRecommendCustomer taRecommendCustomer, Integer orgId);
 
 	void consumeGoodsPoints(TaGoods taGoods, Integer orgId);
@@ -31,4 +35,18 @@ public interface ITaPointsRecordsService extends IService<TaPointsRecords> {
 	 * @param recommenderId
 	 */
     void sharePosterAll(String recommenderId, Integer orgId);
+
+	/**
+	 * 资料审核送积分
+	 * @param taDocumentVerify
+	 * @param orgId
+	 */
+	void documentVerify(TaDocumentVerify taDocumentVerify, Integer orgId);
+
+	/**
+	 * 活动核销送积分
+	 * @param helpInitiateRecord
+	 * @param orgId
+	 */
+	void activityVerificationSign(HelpInitiateRecord helpInitiateRecord, Integer orgId);
 }

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

@@ -17,7 +17,7 @@ import java.util.List;
  */
 public interface ITaShareActivityService extends IService<TaShareActivity> {
 
-    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String status, LocalDateTime startTime, LocalDateTime endTime, Integer orgId);
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String status, LocalDateTime startTime, LocalDateTime endTime, Integer cityId, Integer orgId);
 
     /**
      * 开始未进行的活动

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

@@ -9,6 +9,7 @@ import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.HelpActivity;
 import com.huiju.estateagents.entity.HelpInitiateRecord;
 import com.huiju.estateagents.entity.HelpRecord;
+import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import com.huiju.estateagents.excel.HelpProceedAndFinish;
 import com.huiju.estateagents.excel.HelpRecordExport;
@@ -18,6 +19,7 @@ import com.huiju.estateagents.mapper.HelpRecordMapper;
 import com.huiju.estateagents.service.IHelpActivityService;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 
 import javax.xml.crypto.Data;
@@ -45,6 +47,9 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     @Autowired
     HelpRecordMapper helpRecordMapper;
 
+    @Autowired
+    ApplicationContext applicationContext;
+
     @Override
     public ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer activityStatus, Integer orgId) {
         ResponseBean responseBean = new ResponseBean<>();
@@ -142,6 +147,10 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
         if (verifyCode.equals(Integer.valueOf(helpInitiateRecord.getVerification()))){
             helpInitiateRecord.setVerificationStatus(1);
             helpInitiateRecordMapper.updateById(helpInitiateRecord);
+
+            // 活动核销加积分
+            applicationContext.publishEvent(new EventBus(helpInitiateRecord, EventBus.EventType.ActivityVerificationSign,helpInitiateRecord.getOrgId()));
+
             responseBean.addSuccess("成功");
         }else {
             responseBean.addError("核销码错误,请重新输入");

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

@@ -11,7 +11,9 @@ import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.mapper.HelpActivityMapper;
 import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
 import com.huiju.estateagents.mapper.HelpRecordMapper;
+import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.service.IHelpRecordService;
+import com.huiju.estateagents.service.IMiniAppService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +46,12 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 	@Autowired
 	private HelpRecordMapper helpRecordMapper;
 	
+	@Autowired
+	private TaPersonMapper taPersonMapper;
+	
+	@Autowired
+	private IMiniAppService miniAppService;
+	
 	/**
 	 * 助力者助力
 	 *
@@ -57,13 +65,13 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		//查看是否助力成功
 		HelpInitiateRecord helpInitiateRecord = helpInitiateRecordMapper.selectById(helpRecord.getHelpRecordInitiateId());
 		if (!StringUtils.isEmpty(helpInitiateRecord.getVerification())){
-			return ResponseBean.error("已经助力成功", ResponseBean.ERROR_UNAVAILABLE);
+			return ResponseBean.error("助力失败", ResponseBean.ERROR_UNAVAILABLE);
 		}
 		
 		HelpActivity helpActivity = helpActivityMapper.selectById(helpRecord.getHelpActivityId());
 		//是否助力成功
 		if (null != helpActivity.getEnlistNum() && helpActivity.getEnlistNum() >= helpActivity.getPersonNum()){
-			return ResponseBean.error("已经助力成功", ResponseBean.ERROR_UNAVAILABLE);
+			return ResponseBean.error("助力失败", ResponseBean.ERROR_UNAVAILABLE);
 		}
 		if (helpActivity.getEndDate().isBefore(LocalDateTime.now())){
 			return ResponseBean.error("活动已超时", ResponseBean.ERROR_UNAVAILABLE);
@@ -100,7 +108,8 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		helpRecord.setPersonId(person.getPersonId());
 		helpRecordMapper.insert(helpRecord);
 		if (helpActivity.getEnlistNum().equals(helpActivity.getPersonNum())){
-			//发送微信模板消息所有人都发送--todo
+			//发送微信模板消息所有人都发送
+			sendWxMessage(helpInitiateRecord,orgId,helpActivity);
 			
 			//生成核销码
 			helpInitiateRecord.setVerification(String.valueOf(helpInitiateRecord.getHelpRecordInitiateId()+System.currentTimeMillis()));
@@ -117,5 +126,28 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		map.put("helpInitiateRecord",helpInitiateRecord);
 		return ResponseBean.success(map);
 	}
-
+	
+	/**
+	 * 发送微信消息
+	 * @param helpInitiateRecord
+	 * @param orgId
+	 * @param helpActivity
+	 */
+	private void sendWxMessage(HelpInitiateRecord helpInitiateRecord, Integer orgId, HelpActivity helpActivity) {
+		//发送给发起者
+		TaPerson taPerson = taPersonMapper.selectById(helpInitiateRecord.getPersonId());
+		String link = "/pages/activity/detail/assistance?id="+helpInitiateRecord.getHelpActivityId()+"&initiateId="+helpInitiateRecord.getHelpRecordInitiateId();
+		miniAppService.sendHelpMessage(taPerson,link,"助力成功",helpActivity.getTitle(),LocalDateTime.now());
+		//批量发送给助力者
+		QueryWrapper<HelpRecord> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("org_id",orgId);
+		queryWrapper.eq("help_activity_id",helpInitiateRecord.getHelpActivityId());
+		queryWrapper.eq("help_record_initiate_id",helpInitiateRecord.getHelpRecordInitiateId());
+		List<HelpRecord> helpRecords = helpRecordMapper.selectList(queryWrapper);
+		helpRecords.forEach(e -> {
+			TaPerson toTaPerson = taPersonMapper.selectById(e.getPersonId());
+			miniAppService.sendHelpMessage(toTaPerson,link,"助力成功",helpActivity.getTitle(),LocalDateTime.now());
+		});
+	}
+	
 }

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

@@ -84,6 +84,26 @@ public class MiniAppServiceImpl implements IMiniAppService {
 
         sendMessage("notice", toUser, link, data);
     }
+    
+    @Override
+    public void sendHelpMessage(TaPerson toUser, String link, String result, String activityName, LocalDateTime dt) {
+        List<WxMaTemplateData> data = new ArrayList<>();
+        data.add(new WxMaTemplateData("keyword1", result, "#fffff"));
+        data.add(new WxMaTemplateData("keyword2", activityName, "#fffff"));
+        data.add(new WxMaTemplateData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
+        
+        sendMessage("help.result", toUser, link, data);
+    }
+    
+    @Override
+    public void sendGroupMessage(TaPerson toUser, String link, String result, String activityName, LocalDateTime dt) {
+        List<WxMaTemplateData> data = new ArrayList<>();
+        data.add(new WxMaTemplateData("keyword1", result, "#fffff"));
+        data.add(new WxMaTemplateData("keyword2", activityName, "#fffff"));
+        data.add(new WxMaTemplateData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
+        
+        sendMessage("group.result", toUser, link, data);
+    }
 
     @Override
     public void sendMainBizMessage(TaPerson toUser, String link, String custName, String phone, String sex, String fromName, String bizType, String content) {

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

@@ -4,12 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.entity.TaApartmentImg;
 import com.huiju.estateagents.entity.TaDocumentImg;
 import com.huiju.estateagents.entity.TaDocumentVerify;
 import com.huiju.estateagents.mapper.TaDocumentImgMapper;
 import com.huiju.estateagents.mapper.TaDocumentVerifyMapper;
 import com.huiju.estateagents.service.ITaDocumentVerifyService;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -40,19 +40,23 @@ public class TaDocumentVerifyServiceImpl extends ServiceImpl<TaDocumentVerifyMap
         for (int i = 0; i<data.getRecords().size();i++){
             idList.add(data.getRecords().get(i).getDocumentVerifyId());
         }
-        QueryWrapper<TaDocumentImg>imgQueryWrapper = new QueryWrapper<>();
-        imgQueryWrapper.in("document_verify_id",idList);
-        imgQueryWrapper.eq("org_id",orgId);
-        List<TaDocumentImg>allImgList = taDocumentImgMapper.selectList(imgQueryWrapper);
-        for (int i = 0;i<data.getRecords().size();i++){
-            List<TaDocumentImg>imgList = new ArrayList<>();
-            for(int j = 0; j<allImgList.size();j++){
-                if(data.getRecords().get(i).getDocumentVerifyId().equals(allImgList.get(j).getDocumentVerifyId())){
-                    imgList.add(allImgList.get(j));
+
+        if (CollectionUtils.isNotEmpty(idList)) {
+            QueryWrapper<TaDocumentImg>imgQueryWrapper = new QueryWrapper<>();
+            imgQueryWrapper.in("document_verify_id",idList);
+            imgQueryWrapper.eq("org_id",orgId);
+            List<TaDocumentImg>allImgList = taDocumentImgMapper.selectList(imgQueryWrapper);
+            for (int i = 0;i<data.getRecords().size();i++){
+                List<TaDocumentImg>imgList = new ArrayList<>();
+                for(int j = 0; j<allImgList.size();j++){
+                    if(data.getRecords().get(i).getDocumentVerifyId().equals(allImgList.get(j).getDocumentVerifyId())){
+                        imgList.add(allImgList.get(j));
+                    }
                 }
+                data.getRecords().get(i).setImgList(imgList);
             }
-            data.getRecords().get(i).setImgList(imgList);
         }
+
         return data;
     }
 

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

@@ -313,4 +313,61 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 	}
 
 
+	@Override
+	public void documentVerify(TaDocumentVerify taDocumentVerify, Integer orgId) {
+		// 是否开启积分规则
+		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_DOCUMENT_VERIFY);
+		if (pointsAmount == 0) {
+			return;
+		}
+
+		//
+		String changeType = CommConstant.POINTS_CHANGE_DOCUMENT_VERIFY;
+
+		// 已经领取过的不会再次领取
+		String[] params = {
+				"shareId="+String.valueOf(taDocumentVerify.getDocumentVerifyId()),
+				"openUser="+taDocumentVerify.getPersonId()
+		};
+		String changeParams = String.join("&", params);
+		boolean hasJoined = isPointsRecordsExist(taDocumentVerify.getPersonId(), changeType, changeParams);
+		if (hasJoined) {
+			return;
+		}
+
+		// 发放积分
+		TaPerson person = taPersonMapper.selectById(taDocumentVerify.getPersonId());
+		if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
+			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
+		}
+	}
+
+	@Override
+	public void activityVerificationSign(HelpInitiateRecord helpInitiateRecord, Integer orgId) {
+		// 是否开启积分规则
+		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_ACTIVITY_VERIFICATION);
+		if (pointsAmount == 0) {
+			return;
+		}
+
+		//
+		String changeType = CommConstant.POINTS_CHANGE_ACTIVITY_VERIFICATION;
+
+		// 已经领取过的不会再次领取
+		String[] params = {
+				"shareId="+String.valueOf(helpInitiateRecord.getHelpRecordInitiateId()),
+				"openUser="+helpInitiateRecord.getPersonId()
+		};
+		String changeParams = String.join("&", params);
+		boolean hasJoined = isPointsRecordsExist(helpInitiateRecord.getPersonId(), changeType, changeParams);
+		if (hasJoined) {
+			return;
+		}
+
+		// 发放积分
+		TaPerson person = taPersonMapper.selectById(helpInitiateRecord.getPersonId());
+		if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
+			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
+		}
+	}
 }

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

@@ -30,7 +30,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
     private TaShareActivityMapper taShareActivityMapper;
 
     @Override
-    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String status, LocalDateTime startTime, LocalDateTime endTime, Integer orgId) {
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String activityStatus, LocalDateTime startTime, LocalDateTime endTime, Integer cityId, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         Page<TaShareActivity> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
@@ -39,10 +39,11 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
         QueryWrapper<TaShareActivity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(buildingId != null, "building_id", buildingId);
         queryWrapper.like(activityName != null, "activity_name", activityName);
-        queryWrapper.eq(status != null, "status", status);
+        queryWrapper.eq(activityStatus != null, "activity_status", activityStatus);
         queryWrapper.eq(startTime != null, "start_time", startTime);
         queryWrapper.eq(endTime != null, "end_time", endTime);
         queryWrapper.eq(orgId != null, "org_id", orgId);
+        queryWrapper.eq(cityId != null, "city_id", cityId);
         queryWrapper.orderByDesc("group_acticity_id");
         IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);
 

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

@@ -16,6 +16,7 @@ import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
 import com.huiju.estateagents.mapper.TaShareChildRecordMapper;
 import com.huiju.estateagents.mapper.TaShareRecordMapper;
+import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITaShareChildRecordService;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +44,8 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
     private TaShareActivityMapper activityMapper;
     @Autowired
     private TaShareRecordMapper tashareRecordmapper;
+    @Autowired
+    private IMiniAppService miniAppService;
 
     @Override
     public IPage<TaShareChildRecord> getList(Integer pageNum, Integer pageSize, Integer groupActivityId, Integer status, Integer recordId, Integer orgId) {
@@ -118,13 +121,13 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         //查看是否拼团成功
         TaShareRecord taShareRecord = tashareRecordmapper.selectById(taShareChildRecord.getRecordId());
         if (taShareRecord.getStatus().equals(CommConstant.STATUS_UNACCALIMED)){
-            return ResponseBean.error("已经拼团成功", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("拼团失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         
         //查看是否拼团成功
         TaShareActivity taShareActivity = activityMapper.selectById(taShareChildRecord.getGroupActivityId());
         if (taShareActivity.getJoinPeople() >= taShareActivity.getGroupBuyPeople()){
-            return ResponseBean.error("已经拼团成功", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("拼团失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         if (taShareActivity.getEndTime().isBefore(LocalDateTime.now())){
             return ResponseBean.error("活动已超时", ResponseBean.ERROR_UNAVAILABLE);
@@ -156,7 +159,8 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         taShareChildRecord.setPersonId(person.getPersonId());
         taShareChildRecordMapper.insert(taShareChildRecord);
         if (taShareActivity.getJoinPeople().equals(taShareActivity.getGroupBuyPeople())){
-            //发送微信模板消息所有人都发送--todo
+            //发送微信模板消息所有人都发送
+            sendWxMessage(taShareRecord,orgId,taShareActivity);
             
             //生成团员核销码和改状态拼团成功
             changeChildRecord(taShareChildRecord.getRecordId(),orgId,taShareChildRecord.getGroupActivityId());
@@ -168,6 +172,30 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         return ResponseBean.success(taShareRecord);
     }
     
+    /**
+     * 发送微信消息
+     * @param taShareRecord
+     * @param orgId
+     * @param taShareActivity
+     */
+    private void sendWxMessage(TaShareRecord taShareRecord, Integer orgId, TaShareActivity taShareActivity) {
+        //发送给发起者
+        TaPerson taPerson = taPersonMapper.selectById(taShareRecord.getRecordId());
+        //--todo
+        String link = "/pages/activity/detail/assistance?id="+taShareRecord.getGroupActivityId()+"&initiateId="+taShareRecord.getRecordId();
+        miniAppService.sendHelpMessage(taPerson,link,"助力成功",taShareActivity.getActivityName(),LocalDateTime.now());
+        //批量发送给助力者
+        QueryWrapper<TaShareChildRecord> taShareChildRecordQueryWrapper = new QueryWrapper<>();
+        taShareChildRecordQueryWrapper.eq("org_id",orgId);
+        taShareChildRecordQueryWrapper.eq("group_activity_id",taShareRecord.getGroupActivityId());
+        taShareChildRecordQueryWrapper.eq("record_id",taShareRecord.getRecordId());
+        List<TaShareChildRecord> shareChildRecordList = taShareChildRecordMapper.selectList(taShareChildRecordQueryWrapper);
+        shareChildRecordList.forEach(e -> {
+            TaPerson toTaPerson = taPersonMapper.selectById(e.getPersonId());
+            miniAppService.sendHelpMessage(toTaPerson,link,"助力成功",taShareActivity.getActivityName(),LocalDateTime.now());
+        });
+    }
+    
     /**
      * 更改团员状态和生成核销码
      * @param recordId

src/main/resources/mapper/HelpActivityMapper.xml

@@ -2,28 +2,36 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.HelpActivityMapper">
     <select id="helpActivityListPage" resultType="com.huiju.estateagents.entity.HelpActivity">
-        select * from ta_help_activity
+        SELECT
+        COUNT(hir.verification) as succeedCount,
+        ha.*
+        FROM
+        ta_help_activity ha
+        LEFT JOIN ta_help_initiate_record hir ON ha.help_activity_id = hir.help_activity_id
+        AND (hir.verification is NULL or hir.verification != '')
         <where>
         <if test="cityId != null and cityId != ''">
-            and city_id = #{cityId}
+            and ha.city_id = #{cityId}
         </if>
         <if test="buildingId != null and buildingId != ''">
-            and building_id = #{buildingId}
+            and ha.building_id = #{buildingId}
         </if>
         <if test="title != null and title != ''">
-            and title = #{title}
+            and ha.title like CONCAT('%',#{title}, '%')
         </if>
         <if test="startDate != null and startDate != ''and startDate!='Invalid date'">
-         and date_format(start_date,'%Y-%m-%d') = date_format( #{startDate}, '%Y-%m-%d' )
+         and date_format(ha.start_date,'%Y-%m-%d') = date_format( #{startDate}, '%Y-%m-%d' )
         </if>
         <if test="endDate != null and endDate != ''and endDate!='Invalid date'">
-            and date_format(end_date,'%Y-%m-%d') = date_format( #{endDate}, '%Y-%m-%d' )
+            and date_format(ha.end_date,'%Y-%m-%d') = date_format( #{endDate}, '%Y-%m-%d' )
         </if>
         <if test="activityStatus != null and activityStatus != null">
-            and activity_status = #{activityStatus}
+            and ha.activity_status = #{activityStatus}
         </if>
-            and org_id=#{orgId}
+            and ha.org_id=#{orgId}
         </where>
+        GROUP BY ha.help_activity_id
+        order by ha.activity_status = 0 desc,ha.activity_status = 1 desc,ha.activity_status = 2 desc,ha.start_date desc
     </select>
 
     <update id="updateUnStartHelpActivity">

src/main/resources/mapper/TaDocumentVerifyMapper.xml

@@ -14,7 +14,7 @@
 	    <if test="name != '' and name !=null">
             and IFNULL(b.name,b.nickname) like CONCAT('%',#{name}, '%')
          </if>
-        <if test="name != '' and name !=null">
+        <if test="tel != '' and tel !=null">
             and IFNULL(b.tel,b.phone) = #{tel}
         </if>
         order by a.create_date desc