From 5ab79e7c85b14946979ef061938ff8158f2fb2a6 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Sep 2021 15:52:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E5=85=A5=E7=BB=84=E7=9A=84?=
 =?UTF-8?q?=EF=BC=8C=E9=80=9A=E7=9F=A5=E7=BB=84=E9=95=BFxx=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E4=BA=86,=E5=AD=98=E5=82=A8targetId=EF=BC=8CmessageTy?=
 =?UTF-8?q?pe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/constant/UserMessageTypeConstant.java    | 6 ++++++
 .../invitation/service/impl/GroupInvitationServiceImpl.java | 6 ++++++
 2 files changed, 12 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 20041347b2..da42eb0290 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
@@ -60,4 +60,10 @@ public interface UserMessageTypeConstant {
      * targetId:resi_group.id
      */
     String APPLY_ENTER_GROUP_RES="apply_enter_group_res";
+
+    /**
+     * 组员通过连接自动入组的，通知组长
+     * targetId:resi_group.id
+     */
+    String ENTER_GROUP_BY_LINK_RES="enter_group_by_link_res";
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
index 563e5a8140..a6b031710c 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
@@ -28,6 +28,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.ReadFlagConstant;
+import com.epmet.constant.UserMessageTypeConstant;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
@@ -642,6 +643,11 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		userMessage.setMessageContent(messageContent);
 		userMessage.setReadFlag(ReadFlagConstant.UN_READ);
 		userMessage.setTitle(UserMessageConstant.GROUP_TITLE);
+
+		//21.09.10:记录消息类型和对应的业务id
+		userMessage.setMessageType(UserMessageTypeConstant.ENTER_GROUP_BY_LINK_RES);
+		userMessage.setTargetId(resiGroupDTO.getId());
+
 		//通知群主
 		userMessage.setUserId(groupInvitationDTO.getInviterUserId());
 		Result result = epmetMessageOpenFeignClient.saveUserMessage(userMessage);