|
|
@@ -3560,9 +3560,15 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
}
|
|
|
|
|
|
// 查询最新课程信息
|
|
|
- CourseSchedule courseSchedule = courseScheduleDao.get(item.getId());
|
|
|
+ CourseSchedule newCourseSchedule = courseScheduleDao.get(item.getId());
|
|
|
// 直播课关联直播间编号
|
|
|
- String liveRoomId = getCourseScheduleLiveRoomId(courseSchedule, continueCourseTime, Lists.newArrayList(), Lists.newArrayList());
|
|
|
+ String liveRoomId = getCourseScheduleLiveRoomId(newCourseSchedule, continueCourseTime, Lists.newArrayList(), Lists.newArrayList());
|
|
|
+
|
|
|
+ if (newCourseSchedule.getClassDate().getTime() > item.getClassDate().getTime()) {
|
|
|
+ newCourseSchedule = item;
|
|
|
+ // 关联直播间编号
|
|
|
+ liveRoomId = item.getLiveRoomId();
|
|
|
+ }
|
|
|
|
|
|
ImLiveBroadcastRoom liveRoom = imLiveBroadcastRoomService.getByRoomUid(liveRoomId);
|
|
|
if (Objects.isNull(liveRoom)) {
|
|
|
@@ -3575,7 +3581,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
|
|
|
LiveRoomMessage message = new LiveRoomMessage();
|
|
|
message.setIsIncludeSender(1);
|
|
|
- message.setFromUserId(courseSchedule.getActualTeacherId().toString());
|
|
|
+ message.setFromUserId(newCourseSchedule.getActualTeacherId().toString());
|
|
|
message.setToChatRoomId(liveRoom.getRoomUid());
|
|
|
message.setObjectName(LiveRoomMessage.LIVE_STATUS_CHANGE);
|
|
|
|
