活动排课

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

@@ -2983,22 +2983,23 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             studentRecoverInfo.setCourseCount(teachModeSequence1.length);
             List<CourseSchedule> newCourseSchedules = courseScheduleService.createCourses(studentRecoverInfo, false);
             for (int i = 0; i < newCourseSchedules.size(); i++) {
-                if (newCourseSchedules.get(i).getStartClassTime().before(now)) {
+                CourseSchedule courseSchedule = newCourseSchedules.get(i);
+                if (courseSchedule.getStartClassTime().before(now)) {
                     throw new BizException("排课起始时间不得小于当前时间");
                 }
-                newCourseSchedules.get(i).setName(vipGroup.getName());
-                newCourseSchedules.get(i).setGroupType(GroupType.VIP);
-                newCourseSchedules.get(i).setMusicGroupId(vipGroup.getId().toString());
-                newCourseSchedules.get(i).setClassGroupId(classGroup.getId());
-                newCourseSchedules.get(i).setStatus(CourseStatusEnum.NOT_START);
-                newCourseSchedules.get(i).setActualTeacherId(vipGroup.getUserId());
-                newCourseSchedules.get(i).setTeacherId(vipGroup.getUserId());
-                newCourseSchedules.get(i).setType(CourseSchedule.CourseScheduleType.VIP);
-                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());
+                courseSchedule.setName(vipGroup.getName());
+                courseSchedule.setGroupType(GroupType.VIP);
+                courseSchedule.setMusicGroupId(vipGroup.getId().toString());
+                courseSchedule.setClassGroupId(classGroup.getId());
+                courseSchedule.setStatus(CourseStatusEnum.NOT_START);
+                courseSchedule.setActualTeacherId(vipGroup.getUserId());
+                courseSchedule.setTeacherId(vipGroup.getUserId());
+                courseSchedule.setType(CourseSchedule.CourseScheduleType.VIP);
+                courseSchedule.setTeachMode(teachModeSequence1[i] == 0 ? TeachModeEnum.OFFLINE : TeachModeEnum.ONLINE);
+                if (courseSchedule.getTeachMode().equals(TeachModeEnum.OFFLINE)) {
+                    courseSchedule.setSchoolId(vipGroup.getTeacherSchoolId());
                 }
-                newCourseSchedules.get(i).setOrganId(vipGroup.getOrganId());
+                courseSchedule.setOrganId(vipGroup.getOrganId());
             }
 
             CourseSchedule courseSchedule = newCourseSchedules.stream().max(Comparator.comparing(CourseSchedule::getClassDate)).get();

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupManageController.java

@@ -71,12 +71,6 @@ public class VipGroupManageController extends BaseController {
     @Autowired
     private OrganizationService organizationService;
 
-    @GetMapping("/teacherSalarySettlement")
-    public Object teacherSalarySettlement(){
-//        courseScheduleTeacherSalaryService.teacherSalarySettlement();
-        return succeed();
-    }
-
     @ApiOperation(value = "vip修改")
     @PostMapping("/update")
     @PreAuthorize("@pcs.hasPermissions('vipGroupManage/update')")
@@ -402,13 +396,6 @@ public class VipGroupManageController extends BaseController {
         return succeed();
     }
 
-    @ApiOperation(value = "新增vip课程计划")
-    @PostMapping(value = "/appendVipGroupCourseSchedules")
-    public Object appendVipGroupCourseSchedules(@RequestBody VipGroupApplyDto vipGroupApplyDto){
-//        vipGroupService.appendVipGroupCourseSchedules(vipGroupApplyDto);
-        return succeed();
-    }
-
     @ApiOperation(value = "获取学生指定vip课的剩余课时费用")
     @GetMapping(value = "/getStudentSurplusCourseFee")
     public Object getStudentSurplusCourseFee(Long vipGroupId, Integer studentId){