活动排课

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

@@ -5036,7 +5036,6 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         practiceGroupDao.update(applyBaseInfo);
 
         //创建课程
-
         courseScheduleService.batchAddCourseSchedule(courseSchedules);
 
         //创建老师单节课课酬信息
@@ -5104,7 +5103,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);
+//        courseScheduleService.checkNewCourseSchedules(courseSchedules, false,false);
         return BaseController.succeed(applyBaseInfo.getAuditStatus().getCode());
     }
 

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

@@ -1118,7 +1118,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			studentDao.updateStudentServiceTag(classGroupStudent.getUserId(), null, YesOrNoEnum.YES.getCode());
 		}
 
-		courseScheduleService.checkNewCourseSchedules(courseSchedules, false,false);
+//		courseScheduleService.checkNewCourseSchedules(courseSchedules, false,false);
 
 		try {
 			imGroupService.create(classGroup.getId().longValue(), null, classGroup.getName(), classGroup.getName(), vipGroupApplyBaseInfoDto.getName(), null, null, GroupType.VIP.getCode());
@@ -1404,7 +1404,20 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		//创建课程
 		List<CourseSchedule> courseSchedules = vipGroup.getCourseSchedules();
-
+		for (CourseSchedule courseSchedule : courseSchedules) {
+			courseSchedule.setGroupType(GroupType.VIP);
+			courseSchedule.setMusicGroupId(applyBaseInfo.getId().toString());
+			if(courseSchedule.getTeachMode().equals(TeachModeEnum.OFFLINE)){
+				courseSchedule.setSchoolId(vipGroup.getVipGroupApplyBaseInfo().getTeacherSchoolId());
+			}
+			courseSchedule.setTeacherId(applyBaseInfo.getUserId());
+			courseSchedule.setActualTeacherId(applyBaseInfo.getUserId());
+			courseSchedule.setStatus(CourseStatusEnum.NOT_START);
+			courseSchedule.setType(CourseSchedule.CourseScheduleType.VIP);
+			courseSchedule.setClassGroupId(classGroup.getId());
+			courseSchedule.setName(applyBaseInfo.getName());
+			courseSchedule.setOrganId(applyBaseInfo.getOrganId());
+		}
 		courseScheduleService.batchAddCourseSchedule(courseSchedules);
 
 		//创建老师单节课课酬信息
@@ -1509,7 +1522,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			courseScheduleStudentPaymentDao.batchInsert(courseScheduleStudentPayments);
 			studentDao.updateStudentServiceTag(null,studentIdList, YesOrNoEnum.YES.getCode());
 		}
-		courseScheduleService.checkNewCourseSchedules(courseSchedules, false,false);
+//		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);
@@ -2558,7 +2571,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			studentDao.updateStudentServiceTag(classGroupStudent.getUserId(), null, YesOrNoEnum.YES.getCode());
 		}
 
-		courseScheduleService.checkNewCourseSchedules(courseSchedules, false,false);
+//		courseScheduleService.checkNewCourseSchedules(courseSchedules, false,false);
 
 		try {
 			imGroupService.create(classGroup.getId().longValue(), null, classGroup.getName(), classGroup.getName(), vipGroup.getName(), null, null, GroupType.VIP.getCode());
@@ -2877,7 +2890,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				studentDao.updateStudentServiceTag(null, studentIdList, YesOrNoEnum.YES.getCode());
 
 				courseScheduleStudentPaymentDao.batchInsert(courseScheduleStudentPayments);
-				courseScheduleService.checkNewCourseSchedules(courseSchedules, false,false);
+//				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);