Merge remote-tracking branch 'origin/feature/0803-im' into feature/0803-im

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImGroupMemberServiceImpl.java

@@ -17,6 +17,7 @@ import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.ImGroupMemberRoleType;
 import com.yonge.cooleshow.biz.dal.service.ImGroupMemberService;
 import com.yonge.cooleshow.biz.dal.service.ImGroupService;
+import com.yonge.cooleshow.biz.dal.service.im.ImGroupCoreService;
 import com.yonge.cooleshow.biz.dal.wrapper.im.ImGroupMemberWrapper;
 import com.yonge.toolset.base.exception.BizException;
 import io.rong.models.group.GroupMember;
@@ -55,6 +56,9 @@ public class ImGroupMemberServiceImpl extends ServiceImpl<ImGroupMemberDao, ImGr
     @Autowired
     private ImGroupService imGroupService;
 
+    @Autowired
+    private ImGroupCoreService imGroupCoreService;
+
     @Override
     public ImGroupMemberDao getDao() {
         return this.baseMapper;
@@ -121,12 +125,22 @@ public class ImGroupMemberServiceImpl extends ServiceImpl<ImGroupMemberDao, ImGr
         if (Objects.isNull(imGroup)) {
             throw new BizException("群组不存在");
         }
-        List<GroupMemberWrapper.ImGroupMember> imGroupMembers = imGroupService.getImGroupMembers(groupMemberList);
+        List<com.yonge.cooleshow.biz.dal.wrapper.im.ImGroupMemberWrapper.ImGroupMember> groupMembers = Lists.newArrayList();
+        for (ImGroupMember groupMember : groupMemberList) {
+            groupMembers.add(com.yonge.cooleshow.biz.dal.wrapper.im.ImGroupMemberWrapper.ImGroupMember.builder()
+                    .groupId(groupMember.getGroupId())
+                    .userId(groupMember.getUserId())
+                    .clientType(groupMember.getRoleType().getCode())
+                    .avatar(groupMember.getAvatar())
+                    .nickname(groupMember.getNickname())
+                    .isAdmin(groupMember.getIsAdmin())
+                    .imUserId(imGroupCoreService.getImUserId(groupMember.getUserId().toString(), groupMember.getRoleType().getCode()))
+                    .roleType(groupMember.getRoleType().getCode())
+                    .build());
+        }
         // 添加群成员到当前群组
-        imPluginContext.getPluginService().groupJoin(imGroup.getId(), imGroup.getName(), imGroupMembers);
+        imGroupCoreService.saveImGroupMemberList(imGroup.getId(), groupMembers);
 
-        // 自动激活用户
-        imGroupService.asyncRegisterUser(imGroupMembers);
     }