From 4e4ddadd940d11aa5083748754e81be7865a473c Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 3 Sep 2021 16:12:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=94=E7=A7=8D=E5=85=A5=E7=BB=84=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E5=9D=87=E9=9C=80=E8=A6=81=E6=8E=A8=E9=80=81=E7=AB=99?=
 =?UTF-8?q?=E5=86=85=E4=BF=A1=E3=80=81=E5=BE=AE=E4=BF=A1=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/constant/UserMessageConstant.java  |  1 +
 .../service/GroupInvitationService.java        |  9 ++++++++-
 .../impl/GroupInvitationServiceImpl.java       |  5 +++--
 .../impl/GroupMemeberOperationServiceImpl.java | 18 +++++++++++-------
 4 files changed, 23 insertions(+), 10 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 86cb1a6ff2..831109fc67 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
@@ -29,6 +29,7 @@ public interface UserMessageConstant {
      */
     String INVITED_JOIN_GROUP = "您的好友-【%s】通过邀请连接，加入了【%s】";
     String SCANCODE_JOIN_GROUP = "您的好友-【%s】通过扫描二维码，加入了【%s】";
+    String SHARABLELINK_JOIN_GROUP = "您的好友-【%s】通过分享链接，加入了【%s】";
 
     /**
      * 组成员被禁言时会收到消息：您已被禁言，禁言时间2020.03.20 12:20-2020.03.27  12:20
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/GroupInvitationService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/GroupInvitationService.java
index 4c8897c5f1..8577aa2bd9 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/GroupInvitationService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/GroupInvitationService.java
@@ -21,7 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.invitation.entity.GroupInvitationEntity;
-import com.epmet.resi.group.dto.UserRoleDTO;
+import com.epmet.resi.group.dto.group.ResiGroupDTO;
 import com.epmet.resi.group.dto.invitation.GroupInvitationDTO;
 import com.epmet.resi.group.dto.invitation.form.AccetInvitationFormDTO;
 import com.epmet.resi.group.dto.invitation.form.CreateGroupInvitationFormDTO;
@@ -143,4 +143,11 @@ public interface GroupInvitationService extends BaseService<GroupInvitationEntit
      * @Description 邀请链接或扫码进组
      **/
     AcceptInvitationResultDTO accetInvitationV2(AccetInvitationFormDTO formDTO);
+
+    /**
+     * @Author sun
+     * @Description 将私有化推送站内信、微信方法改为公共方法
+     **/
+    Result sendMessageToLeader(AccetInvitationFormDTO formDTO, ResiGroupDTO resiGroupDTO, GroupInvitationDTO groupInvitationDTO);
+
 }
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 3a59f101a0..563e5a8140 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
@@ -609,7 +609,8 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 	 * @Description 用户通过邀请进群之后，通知群主：您的好友-【认证的居民名字 xxx路-王先生】通过邀请链接，加入了【组名】
 	 * @Date 2020/4/7 14:46
 	 **/
-	private Result sendMessageToLeader(AccetInvitationFormDTO formDTO, ResiGroupDTO resiGroupDTO, GroupInvitationDTO groupInvitationDTO) {
+	@Override
+	public Result sendMessageToLeader(AccetInvitationFormDTO formDTO, ResiGroupDTO resiGroupDTO, GroupInvitationDTO groupInvitationDTO) {
 		//1、根据用户id用户认证注册信息
 		UserResiInfoFormDTO userResiInfoFormDTO = new UserResiInfoFormDTO();
 		userResiInfoFormDTO.setUserId(formDTO.getUserId());
@@ -635,7 +636,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		}
 		//分享链接
 		if(StringUtils.equals(groupInvitationDTO.getInvitationType(),"sharableLink")){
-
+			messageContent = String.format(UserMessageConstant.SHARABLELINK_JOIN_GROUP, userResiInfoDTOResult.getData().getShowName(), resiGroupDTO.getGroupName());
 		}
 		// end
 		userMessage.setMessageContent(messageContent);
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java
index 90cf1e3b15..de5c0b5207 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java
@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.EpmetRoleKeyConstant;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.MqConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.form.mq.MqBaseMsgDTO;
@@ -31,7 +32,6 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.SendMqMsgUtils;
 import com.epmet.dto.IssueShareLinkRecordDTO;
@@ -43,10 +43,9 @@ import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovIssueOpenFeignClient;
 import com.epmet.modules.feign.GovOrgFeignClient;
-import com.epmet.modules.group.dao.ResiGroupDao;
-import com.epmet.modules.group.entity.ResiGroupEntity;
 import com.epmet.modules.group.redis.ResiGroupRedis;
 import com.epmet.modules.group.service.ResiGroupService;
+import com.epmet.modules.invitation.service.GroupInvitationService;
 import com.epmet.modules.member.dao.GroupMemeberOperationDao;
 import com.epmet.modules.member.dao.ResiGroupMemberDao;
 import com.epmet.modules.member.entity.GroupMemeberOperationEntity;
@@ -67,17 +66,16 @@ import com.epmet.resi.group.constant.MemberStateConstant;
 import com.epmet.resi.group.dto.UserRoleDTO;
 import com.epmet.resi.group.dto.group.ResiGroupDTO;
 import com.epmet.resi.group.dto.group.ResiGroupInfoRedisDTO;
+import com.epmet.resi.group.dto.invitation.GroupInvitationDTO;
+import com.epmet.resi.group.dto.invitation.form.AccetInvitationFormDTO;
 import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO;
 import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
 import com.epmet.resi.group.dto.member.ResiGroupMemberInfoRedisDTO;
 import com.epmet.resi.group.dto.member.form.JoinGroupByShareLinkFormDTO;
-import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO;
 import com.epmet.resi.group.dto.member.result.JoinGroupApplyRealTimeResultDTO;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -120,6 +118,8 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl<GroupMemeb
     private TopicShareLinkVisitRecordDao topicShareLinkVisitRecordDao;
     @Autowired
     private GovOrgFeignClient govOrgFeignClient;
+    @Autowired
+    private GroupInvitationService groupInvitationService;
 
     @Override
     public PageData<GroupMemeberOperationDTO> page(Map<String, Object> params) {
@@ -434,7 +434,11 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl<GroupMemeb
             groupRedis.set(groupCache);
         }
         //发送消息
-        //this.sendMessageToLeader(formDTO, resiGroupDTO,groupInvitationDTO);
+        AccetInvitationFormDTO formDTO = new AccetInvitationFormDTO();
+        formDTO.setUserId(formDTO.getUserId());
+        GroupInvitationDTO groupInvitationDTO = new GroupInvitationDTO();
+        groupInvitationDTO.setInvitationType("sharableLink");
+        groupInvitationService.sendMessageToLeader(formDTO, resiGroupDTO,groupInvitationDTO);
 
         return result;
     }