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

---
 .../com/epmet/constant/UserMessageTypeConstant.java    |  6 ++++++
 .../group/service/impl/ResiGroupServiceImpl.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 418162155f..bcce33a915 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
@@ -42,4 +42,10 @@ public interface UserMessageTypeConstant {
      * targetId:resi_group.id
      */
     String CREATE_GROUP_APPLY="create_group_apply";
+
+    /**
+     * 工作端审核建群申请后，通知建组人结果
+     * targetId:resi_group.id
+     */
+    String CREATE_GROUP_APPLY_RES="create_group_apply_res";
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index c81e3ac4d1..1ec41e6060 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -719,6 +719,11 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		userMessageFormDTO.setGridId(resiGroupDTO.getGridId());
 		userMessageFormDTO.setCustomerId(resiGroupDTO.getCustomerId());
 		userMessageFormDTO.setMessageContent(String.format(UserMessageConstant.AGREE_CREATING_GROUP_MSG_TEMPLATE,resiGroupDTO.getGroupName()));
+
+		//21.09.10:记录消息类型和对应的业务id
+		userMessageFormDTO.setMessageType(UserMessageTypeConstant.CREATE_GROUP_APPLY_RES);
+		userMessageFormDTO.setTargetId(agreeApplyGroupFormDTO.getGroupId());
+
 		if(!epmetMessageFeignClient.saveUserMessage(userMessageFormDTO).success()){
 			logger.warn(String.format(ModuleConstant.FAILED_SEND_MESSAGE,String.format(UserMessageConstant.AGREE_CREATING_GROUP_MSG_TEMPLATE,resiGroupDTO.getGroupName())));
 		}
@@ -783,6 +788,11 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		userMessageFormDTO.setGridId(resiGroupDTO.getGridId());
 		userMessageFormDTO.setCustomerId(resiGroupDTO.getCustomerId());
 		userMessageFormDTO.setMessageContent(String.format(UserMessageConstant.DISAGREE_CREATING_GROUP_MSG_TEMPLATE,resiGroupDTO.getGroupName(),disAgreeApplyGroupFormDTO.getRejectReason()));
+
+		//21.09.10:记录消息类型和对应的业务id
+		userMessageFormDTO.setMessageType(UserMessageTypeConstant.CREATE_GROUP_APPLY_RES);
+		userMessageFormDTO.setTargetId(disAgreeApplyGroupFormDTO.getGroupId());
+
 		if(!epmetMessageFeignClient.saveUserMessage(userMessageFormDTO).success()){
 			logger.warn(String.format(ModuleConstant.FAILED_SEND_MESSAGE,String.format(UserMessageConstant.DISAGREE_CREATING_GROUP_MSG_TEMPLATE,resiGroupDTO.getGroupName(),disAgreeApplyGroupFormDTO.getRejectReason())));
 		}