修改陪练课

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

@@ -1117,23 +1117,14 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
             throw new BizException("课程无人购买");
         }
 
+        CourseTimeEntity timeEntity = new CourseTimeEntity();
+        timeEntity.setStartTime(startTime);
+        timeEntity.setEndTime(endTime);
+        List<CourseTimeEntity> timeList=Arrays.asList(timeEntity);
         //校验老师课程是否冲突
-        List<CourseSchedule> scheduleList = this.list(Wrappers.<CourseSchedule>lambdaQuery()
-                .eq(CourseSchedule::getTeacherId, teacherId)
-                .in(CourseSchedule::getStatus, Lists.newArrayList(CourseScheduleEnum.NOT_START.getCode(), CourseScheduleEnum.ING.getCode())));
-        for (CourseSchedule courseSchedule : scheduleList) {
-            if (inInterSection(startTime, endTime, courseSchedule.getStartTime(), courseSchedule.getEndTime(), true)) {
-                throw new BizException("老师排课冲突,课程id:{}", courseSchedule.getId());
-            }
-        }
-
+        this.batchCheckTeacherCourseTime(teacherId, timeList, CourseTimeEntity::getStartTime, CourseTimeEntity::getEndTime);
         //校验学生课程是否冲突
-        List<CourseSchedule> studentList = baseMapper.selectSchedule(courseId);
-        for (CourseSchedule courseSchedule : studentList) {
-            if (inInterSection(startTime, endTime, courseSchedule.getStartTime(), courseSchedule.getEndTime(), true)) {
-                throw new BizException("学生排课冲突,课程id:{}", courseSchedule.getId());
-            }
-        }
+        this.batchCheckTeacherCourseTime(studentPayment.getUserId(), timeList, CourseTimeEntity::getStartTime, CourseTimeEntity::getEndTime);
 
         baseMapper.courseAdjust(adjustVo);
     }

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -325,7 +325,7 @@
         LEFT JOIN course_schedule_replied r ON cs.id_ = r.course_schedule_id_
         WHERE cs.lock_=0
         AND cs.status_ IN ('ING','COMPLETE','NOT_START')
-        AND cs.type_='LIVE'
+        AND cs.type_ IN ('LIVE','PIANO_ROOM_CLASS')
         AND cs.teacher_id_=#{param.teacherId}
         AND cs.class_date_=#{param.classDate}
         AND cs.id_ IN(
@@ -335,7 +335,8 @@
             AND p.course_group_id_ = c.course_group_id_
             AND c.teacher_id_=#{param.teacherId}
             AND c.class_date_=#{param.classDate}
-            AND c.type_='LIVE')
+            AND c.type_ IN ('LIVE','PIANO_ROOM_CLASS')
+            )
         UNION
         SELECT
             p.course_id_ AS courseId,
@@ -482,7 +483,7 @@
         WHERE s.lock_=0
         AND s.status_ IN ('ING','NOT_START','COMPLETE')
         AND s.id_ IN
-        (SELECT course_id_ FROM course_schedule_student_payment WHERE user_id_ = #{param.studentId} AND course_type_ = 'LIVE')
+        (SELECT course_id_ FROM course_schedule_student_payment WHERE user_id_ = #{param.studentId} AND course_type_ IN ('LIVE','PIANO_ROOM_CLASS'))
         AND s.class_date_ = #{param.classDate}
         ORDER BY startTime
     </select>