修改BasePointEventMsg，删除ActPointEventMsg

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/mq/eventmsg/ActPointEventMsg.java

@@ -1,18 +0,0 @@
-package com.epmet.commons.tools.dto.form.mq.eventmsg;
-
-import lombok.Data;
-
-/**
- * 结束活动，发放活动积分消息体
- *
- * @author yinzuomei@elink-cn.com
- * @date 2020/7/27 9:26
- */
-@Data
-public class ActPointEventMsg extends BasePointEventMsg{
-    /**
-     * 参与活动的备注
-     */
-    private String remark;
-
-}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/mq/eventmsg/BasePointEventMsg.java

@@ -42,4 +42,14 @@ public class BasePointEventMsg implements Serializable {
 	 * 是否是通用事件，通用事件不走规则
 	 */
 	private Boolean isCommon;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+	/**
+	 * 业务id eg：活动id
+	 */
+	private String sourceId;
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/LatestDraftActInfoResultDTO.java

@@ -165,5 +165,5 @@ public class LatestDraftActInfoResultDTO implements Serializable {
     /**
      * 活动内容-
      */
-    private List<ActDraftContentDTOResultDTO> actContentList;
+    private List<ActDraftContentDTOResultDTO> actContent;
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java

@@ -23,7 +23,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.MqConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.form.mq.MqBaseMsgDTO;
-import com.epmet.commons.tools.dto.form.mq.eventmsg.ActPointEventMsg;
+import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg;
 import com.epmet.commons.tools.enums.EventEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
@@ -221,8 +221,8 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
         mqBaseMsgDTO.setEventClass(EventEnum.ACTIVE_INSERT_LIVE.getEventClass());
         //事件code
         mqBaseMsgDTO.setEventTag(EventEnum.ACTIVE_INSERT_LIVE.getEventTag());
-        List<ActPointEventMsg> actPointEventMsgList=new ArrayList<>();
+        List<BasePointEventMsg> actPointEventMsgList=new ArrayList<>();
-        ActPointEventMsg actPointEventMsg=new ActPointEventMsg();
+        BasePointEventMsg actPointEventMsg=new BasePointEventMsg();
         actPointEventMsg.setCustomerId(formDTO.getCustomerId());
         actPointEventMsg.setUserId(formDTO.getUserId());
         actPointEventMsg.setActionFlag(MqConstant.PLUS);

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java

@@ -22,7 +22,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.MqConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.form.mq.MqBaseMsgDTO;
-import com.epmet.commons.tools.dto.form.mq.eventmsg.ActPointEventMsg;
+import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg;
 import com.epmet.commons.tools.enums.EventEnum;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -102,8 +102,8 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         mqBaseMsgDTO.setEventClass(EventEnum.REGISTER_VOLUNTEER.getEventClass());
         //事件code
         mqBaseMsgDTO.setEventTag(EventEnum.REGISTER_VOLUNTEER.getEventTag());
-        List<ActPointEventMsg> actPointEventMsgList=new ArrayList<>();
+        List<BasePointEventMsg> actPointEventMsgList=new ArrayList<>();
-        ActPointEventMsg actPointEventMsg=new ActPointEventMsg();
+        BasePointEventMsg actPointEventMsg=new BasePointEventMsg();
         actPointEventMsg.setCustomerId(formDTO.getCustomerId());
         actPointEventMsg.setUserId(formDTO.getUserId());
         actPointEventMsg.setActionFlag(MqConstant.PLUS);

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java

@@ -76,7 +76,7 @@ public class WorkActDraftServiceImpl implements WorkActDraftService {
             LatestDraftActInfoResultDTO latestAct=latestActInfoService.getLatestActDraft(userId);
             if(null!=latestAct){
                 List<ActDraftContentDTOResultDTO> actContentList=latestActContentService.selectActContentList(latestAct.getActDraftId());
-                latestAct.setActContentList(actContentList);
+                latestAct.setActContent(actContentList);
             }
             return latestAct;
         }else{

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java

@@ -6,7 +6,7 @@ import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.MqConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.form.mq.MqBaseMsgDTO;
-import com.epmet.commons.tools.dto.form.mq.eventmsg.ActPointEventMsg;
+import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg;
 import com.epmet.commons.tools.enums.EventEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
@@ -798,19 +798,20 @@ public class WorkActServiceImpl implements WorkActService {
         mqBaseMsgDTO.setEventClass(EventEnum.ACTIVE_SEND_POINT.getEventClass());
         //事件code
         mqBaseMsgDTO.setEventTag(EventEnum.ACTIVE_SEND_POINT.getEventTag());
-        List<ActPointEventMsg> actPointEventMsgList=new ArrayList<>();
+        List<BasePointEventMsg> basePointEventMsgArrayList=new ArrayList<>();
         for(ActUserRelationEntity actUserRelationEntity:actUserRelationEntityList){
-            ActPointEventMsg actPointEventMsg=new ActPointEventMsg();
+            BasePointEventMsg basePointEventMsg=new BasePointEventMsg();
-            actPointEventMsg.setOpAgencyId(opAgencyId);
+            basePointEventMsg.setOpAgencyId(opAgencyId);
-            actPointEventMsg.setCustomerId(actInfoDTO.getCustomerId());
+            basePointEventMsg.setCustomerId(actInfoDTO.getCustomerId());
-            actPointEventMsg.setUserId(actUserRelationEntity.getUserId());
+            basePointEventMsg.setUserId(actUserRelationEntity.getUserId());
-            actPointEventMsg.setActionFlag(MqConstant.PLUS);
+            basePointEventMsg.setActionFlag(MqConstant.PLUS);
-            actPointEventMsg.setPoint(actInfoDTO.getReward());
+            basePointEventMsg.setPoint(actInfoDTO.getReward());
-            actPointEventMsg.setIsCommon(true);
+            basePointEventMsg.setIsCommon(true);
-            actPointEventMsg.setRemark(remark);
+            basePointEventMsg.setRemark(remark);
-            actPointEventMsgList.add(actPointEventMsg);
+            basePointEventMsg.setSourceId(actInfoDTO.getId());
+            basePointEventMsgArrayList.add(basePointEventMsg);
         }
-        mqBaseMsgDTO.setMsg(JSON.toJSONString(actPointEventMsgList));
+        mqBaseMsgDTO.setMsg(JSON.toJSONString(basePointEventMsgArrayList));
         Result result=SendMqMsgUtils.sendMsg(mqBaseMsgDTO);
         if(!result.success()){
             logger.error("活动积分发放失败");