Merge remote-tracking branch 'origin/feature-cluster' into feature-cluster

core/src/main/java/com/wecloud/multimeet/service/impl/MultiMeetServiceImpl.java

@@ -79,8 +79,9 @@ public class MultiMeetServiceImpl implements MultiMeetService {
             log.info("发起方必须在线" + currentClient.getFkAppid() + currentClient.getClientId());
         }
         List<RoomMemberDto> members = Lists.newArrayList();
-        ImMultiRtcRoom rtcRoom = imMultiRtcRoomService.getCachedMultiRtcRoom(currentClient.getFkAppid(), param.getRoomId());
+        List<ImMultiRtcRoomMember> beInvites = Lists.newArrayList();
         List<ImMultiRtcRoomMember> roomMembersToSave = Lists.newArrayList();
+        ImMultiRtcRoom rtcRoom = imMultiRtcRoomService.getCachedMultiRtcRoom(currentClient.getFkAppid(), param.getRoomId());
         if (rtcRoom == null) {
             rtcRoom = new ImMultiRtcRoom();
             rtcRoom.setId(SnowflakeUtil.getId());
@@ -142,14 +143,15 @@ public class MultiMeetServiceImpl implements MultiMeetService {
                 wsMultiMeetWrite.busy(multiMeetBusyResponse, currentClient.getId());
                 continue;
             }
-            ImMultiRtcRoomMember rtcRoomMember = imMultiRtcRoomMemberService.getOne(new QueryWrapper<ImMultiRtcRoomMember>().lambda()
+            ImMultiRtcRoomMember existedRoomMember = imMultiRtcRoomMemberService.getOne(new QueryWrapper<ImMultiRtcRoomMember>().lambda()
                     .eq(ImMultiRtcRoomMember::getClientId, toClientId)
                     .eq(ImMultiRtcRoomMember::getRoomId, param.getRoomId()));
-            if (rtcRoomMember != null) {
+            if (existedRoomMember != null) {
                 // 该房间已邀请过一次，再次发起邀请
-                rtcRoomMember.setState(MultiRtcMemberStateEnum.CALLING.getCode());
-                rtcRoomMember.setCallTime(new Date());
-                imMultiRtcRoomMemberService.updateById(rtcRoomMember);
+                existedRoomMember.setState(MultiRtcMemberStateEnum.CALLING.getCode());
+                existedRoomMember.setCallTime(new Date());
+                imMultiRtcRoomMemberService.updateById(existedRoomMember);
+                beInvites.add(existedRoomMember);
                 continue;
             }
             ImMultiRtcRoomMember roomMember = new ImMultiRtcRoomMember();
@@ -163,6 +165,7 @@ public class MultiMeetServiceImpl implements MultiMeetService {
             roomMember.setCreateTime(new Date());
             roomMember.setUpdateTime(new Date());
             roomMembersToSave.add(roomMember);
+            beInvites.add(roomMember);
             RoomMemberDto roomMemberDto = new RoomMemberDto();
             roomMemberDto.setFkClientId(toClient.getId());
             roomMemberDto.setClientId(toClient.getClientId());
@@ -170,7 +173,7 @@ public class MultiMeetServiceImpl implements MultiMeetService {
             members.add(roomMemberDto);
         }
         imMultiRtcRoomMemberService.saveBatch(roomMembersToSave);
-        for (RoomMemberDto member : members) {
+        for (ImMultiRtcRoomMember member : beInvites) {
             // ws向接收方发送通知
             MultiMeetInviteResponse multiMeetInviteResponse = new MultiMeetInviteResponse();
             multiMeetInviteResponse.setConversationId(param.getConversationId());