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

---
 .../constant/ResiWarmUserMessageConstant.java     |  5 +++++
 .../impl/ResiWarmheartedApplyServiceImpl.java     | 15 +++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmUserMessageConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmUserMessageConstant.java
index 15cb42bd63..13e1231a2a 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmUserMessageConstant.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmUserMessageConstant.java
@@ -26,4 +26,9 @@ public interface ResiWarmUserMessageConstant {
      */
     String AUDIT_REJECT_MSG = "您好，您申请的%s热心居民，已被驳回，原因：%s";
 
+    /**
+     * 热心居民申请-微信订阅behavior
+     */
+    String WX_WARMHEARTED_BEHAVIOR = "热心居民申请消息";
+
 }
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
index c00077dd1f..26beee052c 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
@@ -39,6 +39,7 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.AgencyAndStaffsResultDTO;
 import com.epmet.dto.result.GovStaffRoleResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.modules.feign.EpmetMessageFeignClient;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.feign.GovOrgFeignClient;
@@ -90,6 +91,8 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 	@Autowired
 	private EpmetMessageFeignClient epmetMessageFeignClient;
 	@Autowired
+	private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
+	@Autowired
 	private GovOrgFeignClient govOrgFeignClient;
 	@Autowired
 	private ResiPartyMemberRedis resiPartyMemberRedis;
@@ -438,6 +441,18 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 		String messageContent = String.format(userMsg, gridName,formDTO.getRefuseReason());
 		userMessageFormDTO.setMessageContent(messageContent);
 		userMessageFormDTO.setReadFlag(ReadFlagConstant.UN_READ);
+
+		//发送微信订阅
+		WxSubscribeMessageFormDTO wxSubscribeMessageFormDTO = new WxSubscribeMessageFormDTO();
+		wxSubscribeMessageFormDTO.setCustomerId(formDTO.getCustomerId());
+		wxSubscribeMessageFormDTO.setUserId(formDTO.getUserId());
+		wxSubscribeMessageFormDTO.setClientType(AppClientConstant.APP_RESI);
+		wxSubscribeMessageFormDTO.setBehaviorType(ResiWarmUserMessageConstant.WX_WARMHEARTED_BEHAVIOR);
+		wxSubscribeMessageFormDTO.setMessageContent(messageContent);
+		List<WxSubscribeMessageFormDTO> msgList = new ArrayList<>();
+		msgList.add(wxSubscribeMessageFormDTO);
+		epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList);
+
 		//保存消息
 		return epmetMessageFeignClient.saveUserMessage(userMessageFormDTO);
 	}