From 9f89d01355336395bccc2cda9a6e7dea4ff90947 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Sep 2021 15:37:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E9=95=BF=E5=AE=A1=E6=A0=B8=E5=AE=8C?=
 =?UTF-8?q?=E5=85=A5=E7=BE=A4=E7=94=B3=E8=AF=B7=EF=BC=8C=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=BB=93=E6=9E=9C,=E5=AD=98=E5=82=A8targetId?=
 =?UTF-8?q?=EF=BC=8CmessageType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/constant/UserMessageTypeConstant.java    |  6 ++++++
 .../service/impl/ResiGroupMemberServiceImpl.java       | 10 ++++++++++
 2 files changed, 16 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 54b280cd99..20041347b2 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
@@ -54,4 +54,10 @@ public interface UserMessageTypeConstant {
      * targetId:resi_group.id
      */
     String APPLY_ENTER_GROUP="apply_enter_group";
+
+    /**
+     * 组长审核完入群申请，通知居民结果
+     * targetId:resi_group.id
+     */
+    String APPLY_ENTER_GROUP_RES="apply_enter_group_res";
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
index 2faf36c79f..1f2a2d0681 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
@@ -739,6 +739,11 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		userMessage.setMessageContent(messageContent);
 		userMessage.setReadFlag(ReadFlagConstant.UN_READ);
 		userMessage.setTitle(UserMessageConstant.GROUP_TITLE);
+
+		//21.09.10:记录消息类型和对应的业务id
+		userMessage.setMessageType(UserMessageTypeConstant.APPLY_ENTER_GROUP_RES);
+		userMessage.setTargetId(resiGroupMemberDTO.getResiGroupId());
+
 		//通知群主
 		userMessage.setUserId(resiGroupMemberDTO.getCustomerUserId());
 		epmetMessageOpenFeignClient.saveUserMessage(userMessage);
@@ -824,6 +829,11 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		userMessage.setMessageContent(messageContent);
 		userMessage.setReadFlag(ReadFlagConstant.UN_READ);
 		userMessage.setTitle(UserMessageConstant.GROUP_TITLE);
+
+		//21.09.10:记录消息类型和对应的业务id
+		userMessage.setMessageType(UserMessageTypeConstant.APPLY_ENTER_GROUP_RES);
+		userMessage.setTargetId(groupMemeberOperationDTO.getGroupId());
+
 		//通知群主
 		userMessage.setUserId(groupMemeberOperationDTO.getCustomerUserId());
 		epmetMessageOpenFeignClient.saveUserMessage(userMessage);