Merge branch 'feature/0529-live' into master_saas

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

@@ -3992,6 +3992,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         }
         CourseAttendanceDetailHeadInfoDto courseAttendanceDetailHeadInfoDto = courseScheduleDao.findByCourse(courseScheduleId);
         courseAttendanceDetailHeadInfoDto.setLatestAttendanceTime(studentAttendanceDao.findLatestAttendanceDate(courseScheduleId));
+        courseAttendanceDetailHeadInfoDto.setStudentNum(studentAttendanceDao.getStudentNumByStatus(courseScheduleId, StudentAttendanceStatusEnum.NORMAL));
         courseAttendanceDetailHeadInfoDto.setLeaveStudentNum(studentAttendanceDao.getStudentNumByStatus(courseScheduleId, StudentAttendanceStatusEnum.LEAVE));
         courseAttendanceDetailHeadInfoDto.setTruantStudentNum(studentAttendanceDao.getStudentNumByStatus(courseScheduleId, StudentAttendanceStatusEnum.TRUANT));
         courseAttendanceDetailHeadInfoDto.setLateStudentNum(studentAttendanceDao.getStudentNumByStatus(courseScheduleId, StudentAttendanceStatusEnum.LATE));

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -267,6 +267,13 @@ public class RoomServiceImpl implements RoomService {
         // 网络课形式：RTC房间，直播间
         if (GroupType.LIVE == courseSchedule.getGroupType()) {
 
+            // 学生课程购买记录
+            CourseScheduleStudentPayment studentPayment = courseScheduleStudentPaymentDao.getByUserIdAndCourseId(sysUser.getId(),
+                    courseSchedule.getId());
+            if (Objects.isNull(studentPayment)) {
+                throw new BizException(MessageFormat.format("{0}你已退学", courseSchedule.getName()));
+            }
+
             // 直播课已结束
             if (CourseStatusEnum.NOT_START == courseSchedule.getStatus()) {
                 throw new BizException("直播课未开始");