From f78ff7facfe7d150ae880090b283105671bee76b Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 30 Apr 2020 09:08:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E7=BB=84=E5=AE=A1=E6=A0=B8=E5=90=8C?=
 =?UTF-8?q?=E6=84=8F=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/service/impl/ResiGroupServiceImpl.java      | 11 ++++++++---
 .../java/com/epmet/modules/utils/ModuleConstant.java  |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

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 d4ebfc2034..fcff7bc6cc 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
@@ -550,8 +550,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		userMessageFormDTO.setApp(ModuleConstant.APP_RESI);
 		userMessageFormDTO.setGridId(resiGroupDTO.getGridId());
 		userMessageFormDTO.setCustomerId(resiGroupDTO.getCustomerId());
-		userMessageFormDTO.setMessageContent(ModuleConstant.AGREE_CREATING_GROUP_MSG);
-		epmetMessageFeignClient.saveUserMessage(userMessageFormDTO);
+		userMessageFormDTO.setMessageContent(String.format(ModuleConstant.AGREE_CREATING_GROUP_MSG,resiGroupDTO.getGroupName()));
+		if(!epmetMessageFeignClient.saveUserMessage(userMessageFormDTO).success()){
+			logger.warn(String.format(ModuleConstant.FAILED_SEND_MESSAGE,String.format(ModuleConstant.AGREE_CREATING_GROUP_MSG,resiGroupDTO.getGroupName())));
+		}
 
 		return new Result();
 	}
@@ -593,7 +595,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		userMessageFormDTO.setGridId(resiGroupDTO.getGridId());
 		userMessageFormDTO.setCustomerId(resiGroupDTO.getCustomerId());
 		userMessageFormDTO.setMessageContent(String.format(ModuleConstant.DISAGREE_CREATING_GROUP_MSG,resiGroupDTO.getGroupName(),disAgreeApplyGroupFormDTO.getRejectReason()));
-		epmetMessageFeignClient.saveUserMessage(userMessageFormDTO);
+		if(!epmetMessageFeignClient.saveUserMessage(userMessageFormDTO).success()){
+			logger.warn(String.format(ModuleConstant.FAILED_SEND_MESSAGE,String.format(ModuleConstant.DISAGREE_CREATING_GROUP_MSG,resiGroupDTO.getGroupName(),disAgreeApplyGroupFormDTO.getRejectReason())));
+		}
+
 		return new Result();
 	}
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
index f6a323cb7b..edc6194021 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
@@ -258,7 +258,7 @@ public interface ModuleConstant extends Constant {
 	/**
 	 * 建组审核同意时消息模板
 	 * */
-	String AGREE_CREATING_GROUP_MSG = "您好，您申请的%s小组已通过。";
+	String AGREE_CREATING_GROUP_MSG = "您好，您申请的%s小组，已审核通过。";
 
 	/**
 	 * 审核建组申请消息名称