From a35755b43ff4c1353a705c1b2792f3f97ee77a9e Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 30 Apr 2020 17:58:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E7=BB=84=E5=AE=A1=E6=A0=B8=E9=A9=B3?=
 =?UTF-8?q?=E5=9B=9E=E6=B6=88=E6=81=AF=E6=A8=A1=E6=9D=BF=EF=BC=8C=E7=83=AD?=
 =?UTF-8?q?=E5=BF=83=E5=B1=85=E6=B0=91=E5=AE=A1=E6=A0=B8=E9=A9=B3=E5=9B=9E?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/modules/constant/UserMessageConstant.java  | 4 ++--
 .../warmhearted/constant/ResiWarmUserMessageConstant.java     | 4 ++--
 .../service/impl/ResiWarmheartedApplyServiceImpl.java         | 2 +-
 3 files changed, 5 insertions(+), 5 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 485efb3f86..aae42ec1b6 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
@@ -34,12 +34,12 @@ public interface UserMessageConstant {
     /**
      * 建组审核驳回时消息模板
      * */
-    String DISAGREE_CREATING_GROUP_MSG_TEMPLATE = "您好，您申请的%s小组，由于不符合%s条件的原因，已被驳回。";
+    String DISAGREE_CREATING_GROUP_MSG_TEMPLATE = "您好，您申请的%s，已被驳回，原因：%s。";
 
     /**
      * 建组审核同意时消息模板
      * */
-    String AGREE_CREATING_GROUP_MSG_TEMPLATE = "您好，您申请的%s小组，已审核通过。";
+    String AGREE_CREATING_GROUP_MSG_TEMPLATE = "您好，您申请的%s，已审核通过。";
 
     /**
      * 审核建组申请消息名称
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 3f85a6d199..15cb42bd63 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
@@ -22,8 +22,8 @@ public interface ResiWarmUserMessageConstant {
     String AUDIT_APPROVE_MSG = "您好，您申请的%s热心居民已审核通过，请查看。";
 
     /**
-     * 热心居民申请审核驳回给申请人发送消息：您好，您申请的第三网格热心居民，由于不符合条件的原因，已被驳回。
+     * 热心居民申请审核驳回给申请人发送消息：您好，您申请的第三网格热心居民，已被驳回，原因：不符合要求。
      */
-    String AUDIT_REJECT_MSG = "您好，您申请的%s热心居民，由于不符合条件的原因，已被驳回。";
+    String AUDIT_REJECT_MSG = "您好，您申请的%s热心居民，已被驳回，原因：%s";
 
 }
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 4eaef1114e..6da9ab7c94 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
@@ -419,7 +419,7 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 		if (result.success() && null != result.getData()) {
 			gridName = result.getData().getGridName();
 		}
-		String messageContent = String.format(userMsg, gridName);
+		String messageContent = String.format(userMsg, gridName,formDTO.getRefuseReason());
 		userMessageFormDTO.setMessageContent(messageContent);
 		userMessageFormDTO.setReadFlag(ReadFlagConstant.UN_READ);
 		//保存消息