bug修改

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

@@ -246,7 +246,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 LiveGroupWrapper.LiveGroupStudentQuery.builder().liveGroupId(vipGroup1.getId()).build());
         if (livedStudentList.getRecords().size() >0) {
             // 有人购买过直播课 不可修改判断
-
             // 声部
             if (!vipGroupApplyDto.getVipGroupApplyBaseInfo().getSubjectIdList().equals(applyBaseInfo.getSubjectIdList())) {
                 throw new BizException("已有学生购买直播课，不可修改声部");
@@ -445,38 +444,36 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         applyBaseInfo.setName(vipGroup.getLiveBroadcastRoom().getRoomTitle());
         //课程信息调整
         List<CourseSchedule> courseSchedules = courseScheduleDao.getClassGroupCourses(classGroup.getId().longValue());
-
         Boolean upCourseFlag = true;
         //兼容历史的直播课
         if(CollectionUtils.isEmpty(courseSchedules)){
             courseSchedules = vipGroup.getCourseSchedules();
             upCourseFlag = false;
         }
-        for (CourseSchedule courseSchedule : courseSchedules) {
-            courseSchedule.setGroupType(GroupType.valueOf(groupType));
-            courseSchedule.setMusicGroupId(vipGroupApplyBaseInfoDto.getId().toString());
-            if (courseSchedule.getTeachMode().equals(TeachModeEnum.OFFLINE)) {
-                courseSchedule.setSchoolId(applyBaseInfo.getTeacherSchoolId());
+        if(vipGroup1.getStatus().equals(VipGroupStatusEnum.APPLYING) || vipGroup1.getStatus().equals(VipGroupStatusEnum.NOT_START)){
+            for (CourseSchedule courseSchedule : courseSchedules) {
+                courseSchedule.setGroupType(GroupType.valueOf(groupType));
+                courseSchedule.setMusicGroupId(vipGroupApplyBaseInfoDto.getId().toString());
+                if (courseSchedule.getTeachMode().equals(TeachModeEnum.OFFLINE)) {
+                    courseSchedule.setSchoolId(applyBaseInfo.getTeacherSchoolId());
+                }
+                courseSchedule.setTeacherId(vipGroupApplyBaseInfoDto.getUserId());
+                courseSchedule.setActualTeacherId(vipGroupApplyBaseInfoDto.getUserId());
+                courseSchedule.setStatus(CourseStatusEnum.NOT_START);
+                courseSchedule.setType(CourseSchedule.CourseScheduleType.valueOf(groupType));
+                courseSchedule.setClassGroupId(classGroup.getId());
+                courseSchedule.setName(vipGroupApplyBaseInfoDto.getName());
+                courseSchedule.setOrganId(vipGroupApplyBaseInfoDto.getOrganId());
+            }
+            vipGroupApplyBaseInfoDto.setCourseSchedulesJson(JSON.toJSONString(courseSchedules));
+            if (upCourseFlag) {
+                courseScheduleDao.deleteCourseSchedulesByMusicGroupID(vipGroup1.getId().toString(), vipGroup1.getGroupType());
+                courseScheduleTeacherSalaryDao.deleteByMusicGroupId(vipGroup1.getId().toString(), vipGroup1.getGroupType());
+                teacherAttendanceDao.deleteByMusicGroupId(vipGroup1.getId().toString(), vipGroup1.getGroupType());
             }
-            courseSchedule.setTeacherId(vipGroupApplyBaseInfoDto.getUserId());
-            courseSchedule.setActualTeacherId(vipGroupApplyBaseInfoDto.getUserId());
-            courseSchedule.setStatus(CourseStatusEnum.NOT_START);
-            courseSchedule.setType(CourseSchedule.CourseScheduleType.valueOf(groupType));
-            courseSchedule.setClassGroupId(classGroup.getId());
-            courseSchedule.setName(vipGroupApplyBaseInfoDto.getName());
-            courseSchedule.setOrganId(vipGroupApplyBaseInfoDto.getOrganId());
-        }
-        vipGroupApplyBaseInfoDto.setCourseSchedulesJson(JSON.toJSONString(courseSchedules));
-        if (upCourseFlag) {
-            vipGroup.setCourseSchedules(courseSchedules);
-            courseScheduleDao.batchUpdate(courseSchedules);
-        }else {
             this.liveProgress(vipGroupApplyBaseInfoDto,classGroup);
         }
         if (vipGroup1.getStatus().equals(VipGroupStatusEnum.PROGRESS)) {
-            // 修改课程信息
-            // 修改直播间标题
-
             // 查询未开始课程信息
             List<CourseSchedule> scheduleList = courseScheduleDao.findByClassGroupAndStatus(classGroup.getId(), CourseStatusEnum.NOT_START.getCode());
             Map<Long, CourseSchedule> scheduleMap = courseSchedules.stream().collect(Collectors.toMap(CourseSchedule::getId, Function.identity()));