|
|
@@ -2268,7 +2268,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if (StringUtils.isNotEmpty(vipGroup.getCourseSchedulesJson())) {
|
|
|
+ List<CourseSchedule> groupCourseSchedules = courseScheduleDao.findGroupCourseSchedules(vipGroup.getId().toString(), vipGroup.getGroupType());
|
|
|
+ if(!CollectionUtils.isEmpty(groupCourseSchedules)){
|
|
|
+ vipGroupDetail.setCourseSchedules(groupCourseSchedules);
|
|
|
+ vipGroupDetail.setTotalClassTimes(groupCourseSchedules.size());
|
|
|
+ }else if (StringUtils.isNotEmpty(vipGroup.getCourseSchedulesJson())) {
|
|
|
vipGroupDetail.setCourseSchedules(JSON.parseArray(vipGroup.getCourseSchedulesJson(), CourseSchedule.class));
|
|
|
// 排课时间排序
|
|
|
List<CourseSchedule> collect = vipGroupDetail.getCourseSchedules().stream()
|
