Merge branch 'dev_v1.3.5_20220927'

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

@@ -122,13 +122,16 @@ public class ImGroupMemberServiceImpl extends ServiceImpl<ImGroupMemberDao, ImGr
             imGroupMember.setUserId(userId);
         }
         //更新当前用户关联的该用户的详情信息
-        imGroupMember.setImUserId(imUserId);
         imGroupMember.setNickname(basicUserInfo.getUsername());
         imGroupMember.setAvatar(basicUserInfo.getAvatar());
         if(imGroupMember.getId() != null){
             imGroupMember.setUpdateTime(new Date());
             baseMapper.updateById(imGroupMember);
         }
+
+        // 设置IM好友ID
+        imGroupMember.setImUserId(imUserId);
+
         return imGroupMember;
     }
 

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

@@ -108,6 +108,10 @@ public class ImUserFriendServiceImpl extends ServiceImpl<ImUserFriendDao, ImUser
                 imUserFriend.setFriendNickname(basicUserInfo.getUsername());
                 imUserFriend.setUpdateTime(new Date());
                 baseMapper.updateById(imUserFriend);
+
+                // 设置融云IM好友ID
+                imUserFriend.setImFriendId(imUserId);
+
                 return imUserFriend;
             }
         }