From a4a83fdb3f296459c67c209cfd07cd19ec766e95 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 18 Nov 2020 09:58:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=B5=8B=E4=BB=A3=E7=A0=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/constant/UserMessageConstant.java    | 11 +++++++++++
 .../service/impl/GroupInvitationServiceImpl.java | 16 +++++++++++++---
 2 files changed, 24 insertions(+), 3 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 d7da80088c..9d8024921b 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
@@ -28,6 +28,7 @@ public interface UserMessageConstant {
      * 成员通过链接同意进群后，组长会收到：您的好友-【认证的居民名字 xxx路-王先生】通过邀请链接，加入了【组名】
      */
     String INVITED_JOIN_GROUP = "您的好友-【%s】通过邀请连接，加入了【%s】";
+    String SCANCODE_JOIN_GROUP = "您的好友-【%s】通过扫描二维码，加入了【%s】";
 
     /**
      * 组成员被禁言时会收到消息：您已被禁言，禁言时间2020.03.20 12:20-2020.03.27  12:20
@@ -74,4 +75,14 @@ public interface UserMessageConstant {
      */
     String WX_CREATE_GROUP_BEHAVIOR = "建组申请消息";
 
+    /**
+     * 邀请入组的入组理由
+     */
+    String INVITED_OPERATE = "通过邀请链接加入小组。";
+
+    /**
+     * 扫码入组的入组理由
+     */
+    String SCANCODE_OPERATE = "通过扫码加入小组。";
+
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
index dcd939a5f8..eebc106ca0 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
@@ -389,7 +389,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		operation.setGroupInvitationId(formDTO.getInvitationId());
 		operation.setOperateUserId(formDTO.getUserId());
 		operation.setOperateStatus(MemberStateConstant.UNDER_AUDITTING);
-		operation.setOperateDes("通过扫码加入小组。");
+		operation.setOperateDes(UserMessageConstant.SCANCODE_OPERATE);
 		//入组审核开关是开启状态则需要组长审核
 		if(GroupStateConstant.AUDIT_SWITCH_OPEN.equals(resiGroupDTO.getAuditSwitch())){
 			//新增一条入组申请
@@ -402,7 +402,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		//5、新增一条邀请入群、直接审核通过的入群记录
 		GroupMemeberOperationDTO groupMemeberOperation = operation;
 		groupMemeberOperation.setOperateStatus(MemberStateConstant.APPROVED);
-		groupMemeberOperation.setOperateDes("通过邀请链接加入小组。");
+		groupMemeberOperation.setOperateDes(UserMessageConstant.INVITED_OPERATE);
 		//2020.11.17  end
 		groupMemeberOperationService.accetInvitation(groupMemeberOperation);
 		//6、直接加入群成员关系表
@@ -481,7 +481,17 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		userMessage.setApp(AppClientConstant.APP_RESI);
 		userMessage.setCustomerId(resiGroupDTO.getCustomerId());
 		userMessage.setGridId(resiGroupDTO.getGridId());
-		String messageContent = String.format(UserMessageConstant.INVITED_JOIN_GROUP, userResiInfoDTOResult.getData().getShowName(), resiGroupDTO.getGroupName());
+		//2020.11.18 sun  start
+		String messageContent = "";
+		//邀请链接进组
+		if(GroupStateConstant.GROUP_INVITED.equals(groupInvitationDTO.getInvitationType())){
+			messageContent = String.format(UserMessageConstant.INVITED_JOIN_GROUP, userResiInfoDTOResult.getData().getShowName(), resiGroupDTO.getGroupName());
+		}
+		//扫码进组
+		if(GroupStateConstant.GROUP_SCANCODE.equals(groupInvitationDTO.getInvitationType())){
+			messageContent = String.format(UserMessageConstant.SCANCODE_JOIN_GROUP, userResiInfoDTOResult.getData().getShowName(), resiGroupDTO.getGroupName());
+		}
+		// end
 		userMessage.setMessageContent(messageContent);
 		userMessage.setReadFlag(ReadFlagConstant.UN_READ);
 		userMessage.setTitle(UserMessageConstant.GROUP_TITLE);