建组审核同意模板修改

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();
 	}
 

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小组，已审核通过。";
 
 	/**
 	 * 审核建组申请消息名称