Merge remote-tracking branch 'origin/master'

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

@@ -784,7 +784,7 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
                 return;
             }
             Date now = new Date();
-            String userIdStr = user.getUserid();
+            String userIdStr = imGroupService.analysisImUserId(user.getUserid());
             //获取当前用户所在房间的uid
             RBucket<String> userRoom = redissonClient.getBucket(LIVE_USER_ROOM.replace(USER_ID, userIdStr));
             if (!userRoom.isExists()) {

cooleshow-user/user-biz/src/main/resources/config/mybatis/CoursePlanMapper.xml

@@ -32,7 +32,7 @@
                b.start_time_,
                b.end_time_,
                c.room_uid_ as roomUid,
-               IFNULL(c.live_state_,0) as liveState
+               if(b.status_ = 'COMPLETE',2,IFNULL(c.live_state_,0)) as liveState
         from course_plan as a
                  left join course_schedule as b on a.course_group_id_ = b.course_group_id_
                  AND a.class_num_ = b.class_num_