update

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

@@ -2259,7 +2259,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	}
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     public void vipCourseAdjust(VipGroupCourseAdjustInfoDto vipGroupCourseAdjustInfo) {
         SysUser user = sysUserService.getUser();
         if (Objects.isNull(vipGroupCourseAdjustInfo.getVipGroupId())) {
@@ -2345,9 +2345,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		this.checkLiveAdjust(courseSchedules);
 		//校验机构线上课人数上限
 		this.checkOnlineCategory(courseSchedules,vipGroupCourseAdjustInfo.getTeachMode());
+        courseSchedules.sort(Comparator.comparing(CourseSchedule::getStartClassTime));
 		//拷贝历史直播课
 		List<CourseSchedule> liveCourseSchedules = Lists.newArrayList(courseSchedules);
-        courseSchedules.sort(Comparator.comparing(CourseSchedule::getStartClassTime));
 		//获取操作日志
 		List<CourseScheduleModifyLog> modifyLogs = getModifyLogs(courseScheduleIds, courseSchedules, user.getId(), now);
 
@@ -6493,24 +6493,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			beforeCourse = beforeCourse.stream()
 					.sorted(Comparator.comparing(CourseSchedule::getStartClassTime))
 					.collect(Collectors.toList());
-
-			/*for (int i = beforeCourse.size() - 1; i >= 0 ; i--) {
-				CourseSchedule current = beforeCourse.get(i);
-				CourseSchedule next = null;
-				if ((i - 1) >= 0) {
-					next = beforeCourse.get(i - 1);
-				}
-				if (next != null && current.getContinuousCourse() && next.getContinuousCourse()) {
-					newCourseSchedules.addAll(Lists.newArrayList(current, next));
-				}
-			}*/
-
-			/*List<CourseSchedule> collect = beforeCourse.stream()
-					.filter(CourseSchedule::getContinuousCourse)
-					.collect(Collectors.toList());
-			if (CollectionUtils.isNotEmpty(collect)) {
-				newCourseSchedules.addAll(collect);
-			}*/
 		}
 
 		// 课程后连堂状态
@@ -6532,19 +6514,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					}
 				}
 			}
-
-			/*
-			List<CourseSchedule> collect = afterCourse.stream()
-					.filter(CourseSchedule::getContinuousCourse)
-					.collect(Collectors.toList());
-			if (CollectionUtils.isNotEmpty(collect)) {
-
-				if (CollectionUtils.isEmpty(newCourseSchedules)) {
-					newCourseSchedules.addAll(collect);
-				} else {
-					newCourseSchedules.addAll(collect.subList(1, collect.size()));
-				}
-			}*/
 		}
 
 		if (CollectionUtils.isNotEmpty(newCourseSchedules)) {