Merge remote-tracking branch 'origin/dev_voice_share_point' into dev_temp

epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.10__add_colum_to_share_link_visit.sql

@@ -0,0 +1,2 @@
+ALTER TABLE  `issue_share_link_visit_record`
+ADD COLUMN `IF_JOIN_GROUP` tinyint(1) DEFAULT '0' COMMENT '是否同意进组,1是0否，在注册完居民之后，是否同意入组，如果同意发送入组申请，不同意此项默认为0';

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java

@@ -48,6 +48,7 @@ import com.epmet.modules.member.dao.ResiGroupMemberDao;
 import com.epmet.modules.member.entity.GroupMemeberOperationEntity;
 import com.epmet.modules.member.entity.ResiGroupMemberEntity;
 import com.epmet.modules.member.redis.GroupMemeberOperationRedis;
+import com.epmet.modules.member.redis.ResiGroupMemberRedis;
 import com.epmet.modules.member.service.GroupMemeberOperationService;
 import com.epmet.modules.member.service.ResiGroupMemberService;
 import com.epmet.modules.topic.dao.ResiTopicDao;
@@ -64,6 +65,7 @@ import com.epmet.resi.group.dto.group.ResiGroupDTO;
 import com.epmet.resi.group.dto.group.ResiGroupInfoRedisDTO;
 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;
@@ -107,6 +109,8 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl<GroupMemeb
     @Autowired
     private ResiGroupRedis groupRedis;
     @Autowired
+    private ResiGroupMemberRedis memberRedis;
+    @Autowired
     private EpmetUserOpenFeignClient userClient;
     @Autowired
     private TopicShareLinkVisitRecordDao topicShareLinkVisitRecordDao;
@@ -274,8 +278,12 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl<GroupMemeb
         groupMemeberOperation.setEnterGroupType(StringUtils.equals("topic",param.getShareLinkType()) ? ModuleConstant.ENTER_GROUP_TYPE_TOPIC_LINK : ModuleConstant.ENTER_GROUP_TYPE_ISSUE_LINK);
         groupMemeberOperation.setGroupInvitationId(param.getShareLinkId());
         groupMemeberOperation.setOperateUserId(param.getUserId());
-        groupMemeberOperation.setOperateDes(StringUtils.equals("topic",param.getShareLinkType()) ? "通过话题分享链接申请入组" : "通过议题分享链接申请入组");
-
+        ResiGroupMemberInfoRedisDTO memberInfo = memberRedis.get(groupId, inviter);
+        if(null != memberInfo && StringUtils.isNotBlank(memberInfo.getUserShowName()))
+            groupMemeberOperation.setOperateDes(String.format("通过%s的",memberInfo.getUserShowName())
+                    + (StringUtils.equals("topic",param.getShareLinkType()) ? "话题" : "议题" )+  "分享加入小组");
+        else
+            groupMemeberOperation.setOperateDes(StringUtils.equals("topic",param.getShareLinkType()) ? "通过话题分享申请入组" : "通过议题分享申请入组" );
         //入组审核开关是开启状态则需要组长审核
         if (StringUtils.equals(GroupStateConstant.AUDIT_SWITCH_OPEN , resiGroupDTO.getAuditSwitch())) {
             groupMemeberOperation.setOperateStatus(MemberStateConstant.UNDER_AUDITTING);