From 4e0af170482401e22de64c922d6fbd6f7ad787f2 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Sep 2021 17:31:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E4=BA=A4=E7=BB=84=E9=95=BF=E8=BA=AB?=
 =?UTF-8?q?=E4=BB=BD=EF=BC=8C=E5=AD=98=E5=82=A8targetId=EF=BC=8CmessageTyp?=
 =?UTF-8?q?e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/constant/UserMessageTypeConstant.java    | 10 ++++++++++
 .../impl/GroupLeaderTransferRecordServiceImpl.java     |  9 +++++++++
 2 files changed, 19 insertions(+)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
index 6cb754a94f..c69e463370 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java
@@ -86,6 +86,16 @@ public interface UserMessageTypeConstant {
      */
     String GROUP_ACT_CANCEL="group_act_cancel";
 
+    /**
+     * 工作端转交组长，通知原组长
+     * targetId:resi_group.id
+     */
+    String GROUP_ORIGINAL_LEADER_DOWN="group_original_leader_down";
+    /**
+     * 新人组织，告诉他这个好消息
+     * targetId:resi_group.id
+     */
+    String GROUP_NEW_LEADER_UP="group_new_leader_up";
 
 
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupLeaderTransferRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupLeaderTransferRecordServiceImpl.java
index 492047cf9b..8e2e484b13 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupLeaderTransferRecordServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupLeaderTransferRecordServiceImpl.java
@@ -25,6 +25,7 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.constant.UserMessageTypeConstant;
 import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.modules.constant.UserMessageConstant;
@@ -204,6 +205,10 @@ public class GroupLeaderTransferRecordServiceImpl extends BaseServiceImpl<GroupL
             originalLeader.setCustomerId(formDTO.getCustomerId());
             originalLeader.setMessageContent(String.format(UserMessageConstant.ORIGINAL_LEADER_DOWN,resiGroupDTO.getGroupName()));
 
+            //21.09.10:记录消息类型和对应的业务id
+            originalLeader.setMessageType(UserMessageTypeConstant.GROUP_ORIGINAL_LEADER_DOWN);
+            originalLeader.setTargetId(resiGroupDTO.getId());
+
             msgList.add(originalLeader);
         }
         //新组长
@@ -217,6 +222,10 @@ public class GroupLeaderTransferRecordServiceImpl extends BaseServiceImpl<GroupL
         newLeader.setCustomerId(formDTO.getCustomerId());
         newLeader.setMessageContent(String.format(UserMessageConstant.NEW_LEADER_UP,resiGroupDTO.getGroupName()));
 
+        //21.09.10:记录消息类型和对应的业务id
+        newLeader.setMessageType(UserMessageTypeConstant.GROUP_NEW_LEADER_UP);
+        newLeader.setTargetId(resiGroupDTO.getId());
+
         msgList.add(newLeader);
         if(!epmetMessageOpenFeignClient.saveUserMessageList(msgList).success()){
             log.warn("转让组发送站内信失败");