Merge remote-tracking branch 'origin/zx_online_update_1218' into zx_online_update_1218

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

@@ -734,7 +734,7 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
             coursePlanDto.setFreeEndTime(DateUtil.offsetMinute(coursePlanDto.getEndTime(), dto.getCourseFreeMinutes()));
         }
         // true：趣纠课PRACTICE     false：LIVE直播课
-        boolean courseTypeFlag = Lists.newArrayList(CourseScheduleEnum.PRACTICE,CourseScheduleEnum.VIP,CourseScheduleEnum.GROUP)
+        boolean courseTypeFlag = Lists.newArrayList(CourseScheduleEnum.PRACTICE,CourseScheduleEnum.VIP)
                 .contains(CourseScheduleEnum.existCourseType(dto.getCourseType(), "课程类型不正确！"));
         //先自校验传入时间是否交集
         List<CourseTimeEntity> timeList = dto.getTimeList();

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

@@ -1095,23 +1095,9 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
                 item.setImUserId(imGroupService.getImUserId(String.valueOf(item.getUserId()),ClientEnum.TEACHER.name()));
             }
         }
-
-        Map<String, String> sysConfig = new HashMap<>();
-        //提前XX分钟创建/进入趣纠课房间时间
-        sysConfig.put("practiceStartTime", sysConfigService.findConfigValue(SysConfigConstant.PRE_CREATE_PRACTICE_ROOM_MINUTE));
-        //趣纠课结束后，XX分钟关闭房间
-        sysConfig.put("practiceEndTime", sysConfigService.findConfigValue(SysConfigConstant.DESTROY_EXPIRED_PRACTICE_ROOM_MINUTE));
-        //提前XX分钟创建/进入直播房间的时间
-        sysConfig.put("liveStartTime", sysConfigService.findConfigValue(SysConfigConstant.PRE_CREATE_LIVE_ROOM_MINUTE));
-        //直播结束后，XX分钟关闭房间
-        sysConfig.put("liveEndTime", sysConfigService.findConfigValue(SysConfigConstant.DESTROY_EXPIRED_LIVE_ROOM_MINUTE));
-        //提前XX分钟创建/进入琴房课房间时间
-        sysConfig.put("pianoStartTime", sysConfigService.findConfigValue(SysConfigConstant.PRE_CREATE_PIANO_ROOM_MINUTE));
-        //琴房课结束后，XX分钟关闭房间
-        sysConfig.put("pianoEndTime", sysConfigService.findConfigValue(SysConfigConstant.DESTROY_EXPIRED_PIANO_ROOM_MINUTE));
-
+        Map<String, String> courseJoinMap = getCourseJoinMap();
         Map map = new HashMap();
-        map.put("sysConfig", sysConfig);
+        map.put("sysConfig", courseJoinMap);
         map.put("studentList", teacherList);
         return map;
     }