|
@@ -1676,11 +1676,13 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
newCourseSchedules.get(i).setMusicGroupId(vipGroup.getId().toString());
|
|
newCourseSchedules.get(i).setMusicGroupId(vipGroup.getId().toString());
|
|
newCourseSchedules.get(i).setClassGroupId(classGroup.getId());
|
|
newCourseSchedules.get(i).setClassGroupId(classGroup.getId());
|
|
newCourseSchedules.get(i).setStatus(CourseStatusEnum.NOT_START);
|
|
newCourseSchedules.get(i).setStatus(CourseStatusEnum.NOT_START);
|
|
- newCourseSchedules.get(i).setSchoolId(vipGroup.getTeacherSchoolId());
|
|
|
|
newCourseSchedules.get(i).setActualTeacherId(vipGroup.getUserId());
|
|
newCourseSchedules.get(i).setActualTeacherId(vipGroup.getUserId());
|
|
newCourseSchedules.get(i).setTeacherId(vipGroup.getUserId());
|
|
newCourseSchedules.get(i).setTeacherId(vipGroup.getUserId());
|
|
newCourseSchedules.get(i).setType(CourseSchedule.CourseScheduleType.VIP);
|
|
newCourseSchedules.get(i).setType(CourseSchedule.CourseScheduleType.VIP);
|
|
newCourseSchedules.get(i).setTeachMode(teachModeSequence1[i]==0?TeachModeEnum.OFFLINE:TeachModeEnum.ONLINE);
|
|
newCourseSchedules.get(i).setTeachMode(teachModeSequence1[i]==0?TeachModeEnum.OFFLINE:TeachModeEnum.ONLINE);
|
|
|
|
+ if(newCourseSchedules.get(i).getTeachMode().equals(TeachModeEnum.OFFLINE)){
|
|
|
|
+ newCourseSchedules.get(i).setSchoolId(vipGroup.getTeacherSchoolId());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
courseScheduleService.batchAddCourseSchedule(newCourseSchedules);
|
|
courseScheduleService.batchAddCourseSchedule(newCourseSchedules);
|
|
|
|
|
|
@@ -2271,7 +2273,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
|
|
|
//课程信息调整
|
|
//课程信息调整
|
|
for (CourseSchedule courseSchedule : vipGroupApplyDto.getCourseSchedules()) {
|
|
for (CourseSchedule courseSchedule : vipGroupApplyDto.getCourseSchedules()) {
|
|
- courseSchedule.setSchoolId(vipGroup.getTeacherSchoolId());
|
|
|
|
|
|
+ if(courseSchedule.getTeachMode().equals(TeachModeEnum.OFFLINE)){
|
|
|
|
+ courseSchedule.setSchoolId(vipGroup.getTeacherSchoolId());
|
|
|
|
+ }
|
|
courseSchedule.setTeacherId(vipGroup.getUserId());
|
|
courseSchedule.setTeacherId(vipGroup.getUserId());
|
|
courseSchedule.setActualTeacherId(vipGroup.getUserId());
|
|
courseSchedule.setActualTeacherId(vipGroup.getUserId());
|
|
courseSchedule.setStatus(CourseStatusEnum.NOT_START);
|
|
courseSchedule.setStatus(CourseStatusEnum.NOT_START);
|