积分添加

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/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
@@ -139,7 +144,7 @@ public class TaDocumentVerifyController extends BaseController {
     }
 
     /**
-     * 修改对象
+     * 微信修改对象
      * @param id  实体ID
      * @param list List<TaDocumentImg>
      * @return
@@ -193,7 +198,18 @@ public class TaDocumentVerifyController extends BaseController {
                                              @RequestBody TaDocumentVerify documentVerify){
         ResponseBean responseBean = new ResponseBean();
         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");

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/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/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/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/TaDocumentVerifyServiceImpl.java

@@ -8,6 +8,7 @@ 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;
 
@@ -38,16 +39,19 @@ public class TaDocumentVerifyServiceImpl extends ServiceImpl<TaDocumentVerifyMap
         for (int i = 0; i<data.getRecords().size();i++){
             idList.add(data.getRecords().get(i).getDocumentVerifyId());
         }
-        List<TaDocumentImg>allImgList = taDocumentImgMapper.selectBatchIds(idList);
-        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)) {
+            List<TaDocumentImg>allImgList = taDocumentImgMapper.selectBatchIds(idList);
+            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);
+		}
+	}
 }