|
|
@@ -5287,7 +5287,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public void courseMerge(CourseMergeDto courseMergeInfo) {
|
|
|
Date now = new Date();
|
|
|
- Date thirdDay = Date.from(LocalDate.now().plusDays(3).atStartOfDay(DateUtil.zoneId).toInstant());
|
|
|
|
|
|
if(CollectionUtils.isEmpty(courseMergeInfo.getMergeCourseIds())){
|
|
|
throw new BizException("请选择需要合并的课程");
|
|
|
@@ -5311,9 +5310,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
if(courseSchedule.getStartClassTime().compareTo(now)<=0){
|
|
|
throw new BizException("课程合并仅支持未开始的课程");
|
|
|
}
|
|
|
- if(courseSchedule.getEndClassTime().compareTo(thirdDay)>0){
|
|
|
- throw new BizException("仅支持合并三天以内的课程");
|
|
|
- }
|
|
|
if(VIP.equals(courseSchedule.getGroupType())||PRACTICE.equals(courseSchedule.getGroupType())){
|
|
|
throw new BizException("VIP课、网管课暂不支持课程合并");
|
|
|
}
|
Joburgess