Merge branch 'feature/1113-vipCourse' of http://git.dayaedu.com/yonge/cooleshow into develop-new

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

@@ -3007,6 +3007,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
                 .eq(CourseSchedule::getPushStartMsg, false)
                 .eq(CourseSchedule::getLock, 0)
                 .lt(CourseSchedule::getStartTime, DateUtil.offsetMinute(new Date(), 21))
+                .ge(CourseSchedule::getStartTime, DateUtil.offsetMinute(new Date(), 20))
                 .list();
         if (CollectionUtils.isEmpty(courseSchedules)) {
             return;

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

@@ -817,6 +817,10 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
                     courseScheduleTeacherSalaryService.updateById(salary);
                 }
             }
+        }else {
+            //删除该临时直播间列表
+            RMap<Long, String> map = redissonClient.getMap(TEACHER_TEMP_LIVE_ROOM);
+            map.remove(room.getSpeakerId());
         }
         //修改房间状态
         room.setLiveState(2);