Merge branch 'feature/0626-live' into dev

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImLiveBroadcastRoomServiceImpl.java

@@ -1059,23 +1059,24 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
             //从在线人员列表删除该人员
             onlineUserInfo.fastRemove(userId);
 
-            // 更新用户离线状态
-            ImLiveBroadcastRoomMember roomMember = new ImLiveBroadcastRoomMember();
-            roomMember.setOnlineStatus(0);
-
             // 用户离开直播间
             if (user.getStatus().equals("3")) {
                 // 直播间用户离开状态
-                roomMember.setLiveRoomStatus(0);
 
-            }
+                // 更新用户离线状态
+                ImLiveBroadcastRoomMember roomMember = new ImLiveBroadcastRoomMember();
+                roomMember.setOnlineStatus(0);
 
-            // 更新用户在线状态为离线
-            liveBroadcastRoomMemberService.lambdaUpdate()
+                roomMember.setLiveRoomStatus(0);
+
+                // 更新用户在线状态为离线
+                liveBroadcastRoomMemberService.lambdaUpdate()
                     .eq(ImLiveBroadcastRoomMember::getTenantId, roomVo.getTenantId())
                     .eq(ImLiveBroadcastRoomMember::getRoomUid, roomVo.getRoomUid())
                     .eq(ImLiveBroadcastRoomMember::getUserId, userId)
                     .update(roomMember);
+            }
+
 
             log.info("opsRoom>>>> looker userInfo: {}", JSONObject.toJSONString(userInfo));
 
@@ -2967,7 +2968,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
         for (Long userId : userIds) {
             ImUserState imUserState = new ImUserState();
             imUserState.setUserid(userId.toString());
-            imUserState.setStatus(userMap.getOrDefault(userId.intValue(), new ImLiveBroadcastRoomMember()).getOnlineStatus() == 1 ? "0" : "1");
+            imUserState.setStatus("0");
             imUserState.setOs(callbackAfterNewMemberJoin.getOptPlatform());
             imUserState.setTime(callbackAfterNewMemberJoin.getEventTime().atZone(ZoneId.systemDefault()).toEpochSecond());
             imUserState.setRoomUid(callbackAfterNewMemberJoin.getGroupId());