Merge branch 'feature/0626-live' into test

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

@@ -2886,14 +2886,17 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
                                            .getLiveRoomStatus();
             ImUserState imUserState = new ImUserState();
             imUserState.setUserid(userId.toString());
-            imUserState.setStatus(onlineStatus == 1 && liveRoomStatus == 1?"0":"1");
+//            imUserState.setStatus(onlineStatus == 1 && liveRoomStatus == 1?"0":"1");
+            imUserState.setStatus(onlineStatus == 1 ?"0":"1");
             imUserState.setOs(callbackOnMemberStateChange.getOptPlatform());
             imUserState.setTime(new Date().getTime());
             imUserState.setRoomUid(callbackOnMemberStateChange.getGroupId());
             imUserStates.add(imUserState);
         }
-        opsRoom(imUserStates);
         liveBroadcastRoomMemberDao.updateOnlineStatus(userIds, callbackOnMemberStateChange.getGroupId(),onlineStatus);
+        CompletableFuture.runAsync(() -> {
+            opsRoom(imUserStates);
+        });
 
     }
 
@@ -2926,8 +2929,12 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
             imUserState.setRoomUid(callbackAfterMemberExit.getGroupId());
             imUserStates.add(imUserState);
         }
-        opsRoom(imUserStates);
+
         liveBroadcastRoomMemberDao.updateLiveRoomStatus(userIds, callbackAfterMemberExit.getGroupId(),liveRoomStatus);
+        CompletableFuture.runAsync(() -> {
+            opsRoom(imUserStates);
+        });
+
     }
 
     @Override
@@ -2970,8 +2977,11 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
             imUserState.setRoomUid(callbackAfterNewMemberJoin.getGroupId());
             imUserStates.add(imUserState);
         }
-        opsRoom(imUserStates);
+
         liveBroadcastRoomMemberDao.updateLiveRoomStatus(userIds, callbackAfterNewMemberJoin.getGroupId(),liveRoomStatus);
+        CompletableFuture.runAsync(() -> {
+            opsRoom(imUserStates);
+        });
 
     }