Merge remote-tracking branch 'origin/master'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/CourseScheduleEnum.java

@@ -39,13 +39,15 @@ public enum CourseScheduleEnum implements BaseEnum<String, CourseScheduleEnum> {
      * @param errMsg 错误异常
      */
     public static CourseScheduleEnum existCourseType(String code, String errMsg) {
-        CourseScheduleEnum[] values = {PRACTICE, LIVE};
+        CourseScheduleEnum[] values = {PRACTICE, LIVE, PIANO_ROOM_CLASS};
         existCourse(values, code, errMsg);
         //返回枚举对象
         if (code.equals(CourseScheduleEnum.PRACTICE.getCode())) {
             return CourseScheduleEnum.PRACTICE;
-        } else {
+        } else if (code.equals(CourseScheduleEnum.LIVE.getCode())) {
             return CourseScheduleEnum.LIVE;
+        } else {
+            return CourseScheduleEnum.PIANO_ROOM_CLASS;
         }
     }
 

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

@@ -326,8 +326,9 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
         }
         //获取老师锁课缓存
         RMap<Long, List<CourseTimeEntity>> map = getExpireLiveLockTimeCache(dto.getTeacherId());
-        //陪练课无需锁定时间
-        if (!courseTypeFlag) {
+        //陪练课/琴房课无需锁定时间
+        boolean coursePianoFlag = CourseScheduleEnum.existCourseType(dto.getCourseType(), "课程类型不正确！").equals(CourseScheduleEnum.PIANO_ROOM_CLASS);
+        if (!courseTypeFlag && !coursePianoFlag) {
             //直播课添加课时数据
             map.fastPut(dto.getTeacherId(), timeList);
         }

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

@@ -954,7 +954,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
             //校验缓存中的时间和当前自动生成的时间有没有重复
             dateList.forEach(item ->
             {
-                if (!checkCourseTime(courseTimeCache, CourseTimeEntity::getStartTime, CourseTimeEntity::getEndTime, item.getStartTime(), item.getEndTime())) {
+                if (checkCourseTime(courseTimeCache, CourseTimeEntity::getStartTime, CourseTimeEntity::getEndTime, item.getStartTime(), item.getEndTime())) {
                     throw new BizException("与缓存中时间存在中途");
                 }
             });
@@ -1270,6 +1270,10 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
                 .eq(TeacherFreeTime::getEnableFlag, 1)
                 .eq(TeacherFreeTime::getDefaultFlag, 1));
 
+        if (teacherFreeTime==null){
+            throw new BizException("未查到老师陪练课配置");
+        }
+
         if ((teacherFreeTime.getMonday() == null || teacherFreeTime.getMonday().equals("[]")) &&
                 (teacherFreeTime.getThursday() == null || teacherFreeTime.getThursday().equals("[]")) &&
                 (teacherFreeTime.getWednesday() == null || teacherFreeTime.getWednesday().equals("[]")) &&