Merge branch 'feature/0529-live' into master_saas

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

@@ -1147,13 +1147,13 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		}
 
         for (CourseScheduleDto courseScheduleDto : studentCourseSchedulesWithDate) {
-            if (now.before(courseScheduleDto.getStartClassTime())) {
-                courseScheduleDto.setStatus(CourseStatusEnum.NOT_START);
-            } else if (now.after(courseScheduleDto.getEndClassTime())) {
-                courseScheduleDto.setStatus(CourseStatusEnum.OVER);
-            } else {
-                courseScheduleDto.setStatus(CourseStatusEnum.UNDERWAY);
-            }
+//            if (now.before(courseScheduleDto.getStartClassTime())) {
+//                courseScheduleDto.setStatus(CourseStatusEnum.NOT_START);
+//            } else if (now.after(courseScheduleDto.getEndClassTime())) {
+//                courseScheduleDto.setStatus(CourseStatusEnum.OVER);
+//            } else {
+//                courseScheduleDto.setStatus(CourseStatusEnum.UNDERWAY);
+//            }
             courseScheduleDto.setSubjectName(MapUtils.getString(subjectNameCourseMap, courseScheduleDto.getId()));
             courseScheduleDto.setSubjectId(MapUtils.getString(subjectIdCourseMap, courseScheduleDto.getId()));
 			courseScheduleDto.setReviewId(reviewIdMap.get(courseScheduleDto.getId().intValue()));
@@ -1357,33 +1357,33 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         for (CourseScheduleDto courseScheduleDto : teacherCourseSchedulesWithDate) {
             Long studentNum = studentNumCourseMap.get(courseScheduleDto.getId());
             if (Objects.nonNull(studentNum)) {
-            courseScheduleDto.setStudentAttendanceIsFirstTime(studentNum > 0 ? 0 : 1);
+                courseScheduleDto.setStudentAttendanceIsFirstTime(studentNum > 0 ? 0 : 1);
             } else {
-            courseScheduleDto.setStudentAttendanceIsFirstTime(1);
+                courseScheduleDto.setStudentAttendanceIsFirstTime(1);
             }
 
-            if (now.before(courseScheduleDto.getStartClassTime())) {
-            courseScheduleDto.setStatus(CourseStatusEnum.NOT_START);
-            } else if (now.after(courseScheduleDto.getEndClassTime())) {
-            courseScheduleDto.setStatus(CourseStatusEnum.OVER);
-            } else {
-            courseScheduleDto.setStatus(CourseStatusEnum.UNDERWAY);
-            }
+//            if (now.before(courseScheduleDto.getStartClassTime())) {
+//            courseScheduleDto.setStatus(CourseStatusEnum.NOT_START);
+//            } else if (now.after(courseScheduleDto.getEndClassTime())) {
+//            courseScheduleDto.setStatus(CourseStatusEnum.OVER);
+//            } else {
+//            courseScheduleDto.setStatus(CourseStatusEnum.UNDERWAY);
+//            }
             if (Objects.nonNull(courseScheduleDto.getClassGroupId())) {
-            //                String[] studentNames = classGroupStudentMapperDao.findCourseStudentName(courseScheduleDto.getId().intValue());
-            List<StudentNameAndPhoneDto> courseStudentNameAndPhone = classGroupStudentMapperDao.findCourseStudentNameAndPhone(courseScheduleDto.getId().intValue());
-            if(!CollectionUtils.isEmpty(courseStudentNameAndPhone)){
-            List<String> studentNames = courseStudentNameAndPhone.stream().filter(s->Objects.nonNull(s)&&Objects.nonNull(s.getUserName())).map(StudentNameAndPhoneDto::getUserName).collect(Collectors.toList());
-            courseScheduleDto.setStudentNames(StringUtils.join(studentNames, ","));
-            courseScheduleDto.setStudents(courseStudentNameAndPhone);
-            }
+                //                String[] studentNames = classGroupStudentMapperDao.findCourseStudentName(courseScheduleDto.getId().intValue());
+                List<StudentNameAndPhoneDto> courseStudentNameAndPhone = classGroupStudentMapperDao.findCourseStudentNameAndPhone(courseScheduleDto.getId().intValue());
+                if(!CollectionUtils.isEmpty(courseStudentNameAndPhone)){
+                    List<String> studentNames = courseStudentNameAndPhone.stream().filter(s->Objects.nonNull(s)&&Objects.nonNull(s.getUserName())).map(StudentNameAndPhoneDto::getUserName).collect(Collectors.toList());
+                    courseScheduleDto.setStudentNames(StringUtils.join(studentNames, ","));
+                    courseScheduleDto.setStudents(courseStudentNameAndPhone);
+                }
             }
             courseScheduleDto.setSubjectName(subjectNameCourseMap.get(courseScheduleDto.getId()));
             courseScheduleDto.setSubjectId(subjectIdCourseMap.get(courseScheduleDto.getId()));
             Long leaveStudentNum = courseLeaveStudentNumMap.get(courseScheduleDto.getId());
             Long normalStudentNum = classGroupStudentNumMap.get(courseScheduleDto.getClassGroupId());
             if(Objects.nonNull(leaveStudentNum)&&Objects.nonNull(normalStudentNum)&&leaveStudentNum.intValue()==normalStudentNum.intValue()){
-            courseScheduleDto.setEnableAdjustInToday(1);
+                courseScheduleDto.setEnableAdjustInToday(1);
             }
             List<CourseScheduleReview> courseScheduleReviews = idCourseReview.get(courseScheduleDto.getId().intValue());
             if(!CollectionUtils.isEmpty(courseScheduleReviews)){

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

@@ -344,6 +344,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         }
 
         vipGroupApplyBaseInfoDto.setName(vipGroup.getLiveBroadcastRoom().getRoomTitle());
+        vipGroupApplyBaseInfoDto.setSubjectId(Integer.parseInt(vipGroup.getLiveBroadcastRoom().getSubjectId()));
 
         vipGroupDao.update(vipGroupApplyBaseInfoDto);
 
@@ -560,6 +561,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 
             vipGroupApplyBaseInfoDto.setName(vipGroup.getLiveBroadcastRoom().getRoomTitle());
+            vipGroupApplyBaseInfoDto.setSubjectId(Integer.parseInt(vipGroup.getLiveBroadcastRoom().getSubjectId()));
         }
         vipGroupDao.insert(vipGroupApplyBaseInfoDto);
 
@@ -4938,16 +4940,16 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         }
 
 
-        SysMessageConfig sysMessageConfig = sysMessageConfigDao.queryByType(MessageTypeEnum.JIGUANG_LIVE_COURSE_START.getCode());
-        sysMessageConfig = sysMessageConfigDao.queryByType(MessageTypeEnum.JIGUANG_LIVE_COURSE_START_STUDENT.getCode());
-        sysMessageConfig = sysMessageConfigDao.queryByType(MessageTypeEnum.IM_LIVE_COURSE_START_GROUP.getCode());
+        SysMessageConfig sysMessageConfig1 = sysMessageConfigDao.queryByType(MessageTypeEnum.JIGUANG_LIVE_COURSE_START.getCode());
+        SysMessageConfig sysMessageConfig2 = sysMessageConfigDao.queryByType(MessageTypeEnum.JIGUANG_LIVE_COURSE_START_STUDENT.getCode());
+        SysMessageConfig sysMessageConfig3 = sysMessageConfigDao.queryByType(MessageTypeEnum.IM_LIVE_COURSE_START_GROUP.getCode());
 
 
         for (CourseSchedule courseSchedule : courseSchedules) {
-            String studentUrl = sysMessageConfig.getUrl();
-            String teacherUrl = sysMessageConfig.getUrl();
+            String studentUrl = sysMessageConfig1.getUrl();
+            String teacherUrl = sysMessageConfig2.getUrl();
 
-            String imUrl = sysMessageConfig.getUrl();
+            String imUrl = sysMessageConfig3.getUrl();
 
             // 获取班级名
             ClassGroup classGroup = classGroupDao.get(courseSchedule.getClassGroupId());