Merge remote-tracking branch 'origin/dev_20230222_live' into dev_20230222_live

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

@@ -2050,10 +2050,13 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
         // 不在从缓存中获取观看人数，改为从数据库中获取
 
         RoomMemberNumDto roomMemberNumDto = liveBroadcastRoomMemberDao.queryMemberNum(roomVo.getRoomUid());
-        if (Objects.nonNull(roomMemberNumDto)) {
-            roomVo.setTotalLookNum(roomMemberNumDto.getTotalNum());
-            roomVo.setLookNum(roomMemberNumDto.getOnlineNum());
+        if (roomMemberNumDto == null) {
+            roomMemberNumDto = new RoomMemberNumDto();
+            roomMemberNumDto.setTotalNum(0);
+            roomMemberNumDto.setOnlineNum(0);
         }
+        roomVo.setTotalLookNum(roomMemberNumDto.getTotalNum() == null? 0 : roomMemberNumDto.getTotalNum());
+        roomVo.setLookNum(roomMemberNumDto.getOnlineNum() == null? 0 : roomMemberNumDto.getOnlineNum());
 
         // 直播视频数
         List<ImLiveRoomVideoVo> imLiveRoomVideoVos = imLiveRoomVideoService.queryList(roomVo.getRoomUid());

mec-biz/src/main/resources/config/mybatis/ImLiveBroadcastRoomMemberMapper.xml

@@ -93,7 +93,7 @@
     <select id="queryMemberNum" resultType="com.ym.mec.biz.dal.dto.RoomMemberNumDto">
         select room_uid_ as roomUid,
         count(1) as totalNum ,
-        count(if(online_status_ = 1 and live_room_status_ = 1,1,0)) as onlineNum
+        sum(if(online_status_ = 1 and live_room_status_ = 1,1,0)) as onlineNum
         from im_live_broadcast_room_member
         where room_uid_ = #{roomUid}
         group by room_uid_