1、乐团课新增排课教师课酬计算逻辑调整

2、陪练课配置
3、陪练课接口

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

@@ -122,15 +122,14 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             boolean enableCreateSecondCourse=true;
             for (int i=0;i<teacherCourses.size()-1;i++) {
                 CourseSchedule preCourseSchedule = teacherCourses.get(i);
-                CourseSchedule backCourseSchedule = teacherCourses.get(i+1);
 
                 if(practiceGroup.getFirstCourseTime().before(preCourseSchedule.getEndClassTime())
-                        &&firstClassEndTime.after(backCourseSchedule.getStartClassTime())){
+                        &&firstClassEndTime.after(preCourseSchedule.getStartClassTime())){
                     enableCreateFirstCourse=false;
                 }
 
                 if(practiceGroup.getSecondCourseTime().before(preCourseSchedule.getEndClassTime())
-                        &&secondClassEndTime.after(backCourseSchedule.getStartClassTime())){
+                        &&secondClassEndTime.after(preCourseSchedule.getStartClassTime())){
                     enableCreateSecondCourse=false;
                 }
             }
@@ -358,9 +357,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         Integer applyTimes = 0;
         applyTimes = practiceGroupDao.countUserPracticeApplyRecord(practiceGroup.getStudentId());
 
-        if (applyTimes >= 1) {
-            throw new BizException("您的预约次数已经达到限制");
-        }
+//        if (applyTimes >= 1) {
+//            throw new BizException("您的预约次数已经达到限制");
+//        }
         applyTimes += 1;
 
         practiceGroup.setCoursesStartDate(allCourseDates.get(0));

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -2151,6 +2151,6 @@
             LEFT JOIN course_schedule cs ON csts.course_schedule_id_ = cs.id_
         WHERE
             csts.user_id_ = #{userId}
-            AND #{endTime} < CONCAT( cs.class_date_, ' ', cs.end_class_time_ ) AND #{startTime} > CONCAT( cs.class_date_, ' ', cs.start_class_time_ );
+            AND #{startTime} < CONCAT( cs.class_date_, ' ', cs.end_class_time_ ) AND #{endTime} > CONCAT( cs.class_date_, ' ', cs.start_class_time_ );
     </select>
 </mapper>