Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -1420,7 +1420,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
 
         //排课处理
-        courseScheduleService.checkSnapCourseShchedules(courseScheduleList);
+        if(classGroup.getType().equals(ClassGroupTypeEnum.SNAP)){
+            courseScheduleService.checkSnapCourseShchedules(courseScheduleList);
+        }else {
+            courseScheduleService.checkNewCourseSchedules(courseScheduleList,false);
+        }
 
         //老师结算表
         courseScheduleTeacherSalaryService.batchInsert(courseScheduleTeacherSalaryList);
@@ -1509,6 +1513,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         //计算每节课的课酬
         List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaryList = new ArrayList<>();
         List<CourseScheduleStudentPayment> courseScheduleStudentPaymentList = new ArrayList<>();
+        List<CourseSchedule> courseScheduleList = new ArrayList<>();
+
         BigDecimal expectPrice = new BigDecimal("0");
         int times = 0;
         Map<String, Integer> holidayDays = new HashMap<>();
@@ -1563,6 +1569,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 }
                 courseSchedule.setTeacherId(teacherId);
                 courseSchedule.setActualTeacherId(teacherId);
+                courseScheduleList.add(courseSchedule);
 
                 courseScheduleDao.insert(courseSchedule);
 
@@ -1642,6 +1649,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
             now = now.plusDays(1);
         }
+        courseScheduleService.checkSnapCourseShchedules(courseScheduleList);
 
         //老师结算表
         courseScheduleTeacherSalaryService.batchInsert(courseScheduleTeacherSalaryList);