Merge remote-tracking branch 'origin/master'

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

@@ -2073,11 +2073,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				newCourseSchedules.get(i).setOrganId(vipGroup.getOrganId());
 			}
 
-			if(courseInfo1.containsKey("days")){
+			if(Objects.nonNull(studentRecoverInfo.getExpireDate())){
 				CourseSchedule courseSchedule = newCourseSchedules.stream().max(Comparator.comparing(CourseSchedule::getClassDate)).get();
 				if(courseSchedule.getEndClassTime().compareTo(studentRecoverInfo.getExpireDate())>0&&!DateUtil.isSameDay(courseSchedule.getEndClassTime(), studentRecoverInfo.getExpireDate())){
 					throw new BizException("排课时间不可超过{}", DateUtil.dateToString(studentRecoverInfo.getExpireDate(), "yyyy年MM月dd日"));
 				}
+				vipGroup.setCoursesExpireDate(courseSchedule.getEndClassTime());
 			}
 
 			courseScheduleService.batchAddCourseSchedule(newCourseSchedules);