活动排课

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

@@ -5036,7 +5036,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         practiceGroupDao.update(applyBaseInfo);
 
         //创建课程
-        courseScheduleService.checkNewCourseSchedules(courseSchedules, false,false);
+
         courseScheduleService.batchAddCourseSchedule(courseSchedules);
 
         //创建老师单节课课酬信息
@@ -5104,6 +5104,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             userRoleMap.put(classGroupStudent.getUserId(),null);
             studentDao.updateStudentServiceTag(classGroupStudent.getUserId(), null, YesOrNoEnum.YES.getCode());
         }
+        courseScheduleService.checkNewCourseSchedules(courseSchedules, false,false);
         return BaseController.succeed(applyBaseInfo.getAuditStatus().getCode());
     }
 

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

@@ -1404,7 +1404,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		//创建课程
 		List<CourseSchedule> courseSchedules = vipGroup.getCourseSchedules();
-		courseScheduleService.checkNewCourseSchedules(courseSchedules, false,false);
+
 		courseScheduleService.batchAddCourseSchedule(courseSchedules);
 
 		//创建老师单节课课酬信息
@@ -1509,7 +1509,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			courseScheduleStudentPaymentDao.batchInsert(courseScheduleStudentPayments);
 			studentDao.updateStudentServiceTag(null,studentIdList, YesOrNoEnum.YES.getCode());
 		}
-
+		courseScheduleService.checkNewCourseSchedules(courseSchedules, false,false);
 		try {
 			imGroupService.create(classGroup.getId().longValue(), null, classGroup.getName(), classGroup.getName(), applyBaseInfo.getName(), null, null, GroupType.VIP.getCode());
 			imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);
@@ -2806,7 +2806,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				//生成课表
 				List<CourseSchedule> courseSchedules = JSON.parseArray(vipGroup.getCourseSchedulesJson(),CourseSchedule.class);
 				classGroup.setTotalClassTimes(courseSchedules.size());
-				courseScheduleService.checkNewCourseSchedules(courseSchedules, false,false);
+
 				courseScheduleService.batchAddCourseSchedule(courseSchedules);
 
 				//考勤信息
@@ -2877,6 +2877,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				studentDao.updateStudentServiceTag(null, studentIdList, YesOrNoEnum.YES.getCode());
 
 				courseScheduleStudentPaymentDao.batchInsert(courseScheduleStudentPayments);
+				courseScheduleService.checkNewCourseSchedules(courseSchedules, false,false);
 
 				imGroupService.create(classGroup.getId().longValue(), null, classGroup.getName(), classGroup.getName(), vipGroup.getName(), null, null, GroupType.VIP.getCode());
 				imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);