Merge branch 'adapay_new' of http://git.dayaedu.com/yonge/mec into adapay_new

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

@@ -2706,6 +2706,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         if(groupType == VIP){
 			VipGroup vipGroup = vipGroupDao.get(vipGroupCourseAdjustInfo.getVipGroupId().longValue());
 
+			CourseSchedule courseSchedule = courseSchedules.stream().max(Comparator.comparing(CourseSchedule::getEndClassTime)).get();
+			if(courseSchedule.getEndClassTime().compareTo(vipGroup.getCoursesExpireDate())>0){
+				throw new BizException("调整失败：课程时间超过课程有效期");
+			}
+
 			BigDecimal teacherSalary=BigDecimal.ZERO;
 
 			Map<String, BigDecimal> salaryMap = vipGroupService.countVipGroupPredictFee(vipGroup, vipGroup.getUserId(), null, null);