From d588d209de8b82af827004347c3654748579f216 Mon Sep 17 00:00:00 2001
From: liushaowen <565850092@qq.com>
Date: Fri, 23 Oct 2020 11:10:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E7=BB=84=E9=95=BF?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=94=A8=E6=88=B7=E7=9A=84=E5=85=A5=E7=BB=84?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E8=AE=A2=E9=98=85=E4=BA=86=E6=B6=88=E6=81=AF=EF=BC=88?=
 =?UTF-8?q?=E4=B8=8B=E5=90=8C=EF=BC=89=EF=BC=8C=E7=BB=99=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E5=85=A5=E7=BB=84=E7=9A=84=E7=94=A8=E6=88=B7=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E4=B8=80=E6=9D=A1=E8=AE=A2=E9=98=85=E6=B6=88=E6=81=AF=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/constant/UserMessageConstant.java |  5 ++++
 .../impl/ResiGroupMemberServiceImpl.java      | 25 +++++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java
index 71bef9e2d4..f9b97bfb9f 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java
@@ -59,4 +59,9 @@ public interface UserMessageConstant {
      */
     String CREATION_OF_GROUP_MESSAGE_TEMPLATE = "%s%s申请创建小组【%s】，请审核。";
 
+    /**
+     * 组长审核入组申请时的微信订阅behavior
+     */
+    String WX_APPLY_GROUP_BEHAVIOR = "小组消息";
+
 }
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 803ea51d94..db6422eee4 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
@@ -34,6 +34,7 @@ import com.epmet.constant.ReadFlagConstant;
 import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.form.UserResiInfoListFormDTO;
+import com.epmet.dto.form.WxSubscribeMessageFormDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.modules.constant.GroupMemberConstant;
@@ -435,7 +436,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 	 * @return void
 	 * @param resiGroupMemberDTO
 	 * @Author yinzuomei
-	 * @Description 用户会收到：您有一条小组消息。  您加入的【组名】已通过审核，请查看。
+	 * @Description 用户会收到：您有一条小组消息。  您加入的【组名】已通过审核，请查看。发送微信订阅通知
 	 * @Date 2020/4/7 15:39
 	 **/
 	private void sendUserApprovedMessage(ResiGroupMemberDTO resiGroupMemberDTO) {
@@ -452,6 +453,16 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		//通知群主
 		userMessage.setUserId(resiGroupMemberDTO.getCustomerUserId());
 		epmetMessageOpenFeignClient.saveUserMessage(userMessage);
+		//2 给用户发送微信订阅
+		WxSubscribeMessageFormDTO wxSubscribeMessageFormDTO = new WxSubscribeMessageFormDTO();
+		wxSubscribeMessageFormDTO.setCustomerId(resiGroupMemberDTO.getCustomerId());
+		wxSubscribeMessageFormDTO.setUserId(resiGroupMemberDTO.getCustomerUserId());
+		wxSubscribeMessageFormDTO.setClientType(AppClientConstant.APP_RESI);
+		wxSubscribeMessageFormDTO.setBehaviorType(UserMessageConstant.WX_APPLY_GROUP_BEHAVIOR);
+		wxSubscribeMessageFormDTO.setMessageContent(messageContent);
+		List<WxSubscribeMessageFormDTO> msgList = new ArrayList<>();
+		msgList.add(wxSubscribeMessageFormDTO);
+		epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList);
 	}
 
 	/**
@@ -500,7 +511,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 	 * @param groupMemeberOperationDTO
 	 * @param disagreeApplyFormDTO
 	 * @Author yinzuomei
-	 * @Description 您在【组名】的入组申请被拒绝。原因：【组长拒绝审核时输入的备注】
+	 * @Description 您在【组名】的入组申请被拒绝。原因：【组长拒绝审核时输入的备注】； 发送微信订阅
 	 * @Date 2020/4/7 15:39
 	 **/
 	private void sendUserRejectedMessage(GroupMemeberOperationDTO groupMemeberOperationDTO,DisagreeApplyFormDTO disagreeApplyFormDTO) {
@@ -517,6 +528,16 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		//通知群主
 		userMessage.setUserId(groupMemeberOperationDTO.getCustomerUserId());
 		epmetMessageOpenFeignClient.saveUserMessage(userMessage);
+		//2 给用户发送微信订阅
+		WxSubscribeMessageFormDTO wxSubscribeMessageFormDTO = new WxSubscribeMessageFormDTO();
+		wxSubscribeMessageFormDTO.setCustomerId(resiGroupDTO.getCustomerId());
+		wxSubscribeMessageFormDTO.setUserId(groupMemeberOperationDTO.getCustomerUserId());
+		wxSubscribeMessageFormDTO.setClientType(AppClientConstant.APP_RESI);
+		wxSubscribeMessageFormDTO.setBehaviorType(UserMessageConstant.WX_APPLY_GROUP_BEHAVIOR);
+		wxSubscribeMessageFormDTO.setMessageContent(messageContent);
+		List<WxSubscribeMessageFormDTO> msgList = new ArrayList<>();
+		msgList.add(wxSubscribeMessageFormDTO);
+		epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList);
 	}
 
     /**