merge

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

@@ -6556,6 +6556,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 						courseScheduleDao.batchUpdateContinuousCourse(collect, true);
 					}
 
+					// 更新连堂课状态,最后一节课重置
+					CourseSchedule lastCourseSchedule = newCourseSchedules.get(newCourseSchedules.size() - 1);
+					if (Objects.nonNull(lastCourseSchedule)) {
+						courseScheduleDao.batchUpdateContinuousCourse(Lists.newArrayList(lastCourseSchedule.getId()), false);
+					}
+
 				} catch (Exception e) {
 					log.error("getLiveCourseScheduleTime courseScheduleIds={}", collect, e);
 				}

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

@@ -1891,6 +1891,16 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
         roomMember.setLiveRoomStatus(1);
         roomMember.setMicrophoneFlag(microphoneFlag);
 
+        ImLiveBroadcastRoomMember liveRoomMember = liveBroadcastRoomMemberService.lambdaQuery()
+                .eq(ImLiveBroadcastRoomMember::getTenantId, userInfo.getTenantId())
+                .eq(ImLiveBroadcastRoomMember::getRoomUid, imLiveBroadcastRoomVo.getRoomUid())
+                .eq(ImLiveBroadcastRoomMember::getUserId, userInfo.getUserId())
+                .list().stream().findFirst().orElse(null);
+        if (Objects.nonNull(liveRoomMember)) {
+           return userInfo;
+        }
+
+
         // 保存直播间用户信息
         liveBroadcastRoomMemberService.save(roomMember);