|
|
@@ -1968,9 +1968,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
StudentVipGroupDetailDto vipGroupDetail = vipGroupDao.getVipGroupDetail(groupId);
|
|
|
if (StringUtils.isNotEmpty(vipGroup.getCourseSchedulesJson())) {
|
|
|
vipGroupDetail.setCourseSchedules(JSON.parseArray(vipGroup.getCourseSchedulesJson(), CourseSchedule.class));
|
|
|
+ // 排课时间排序
|
|
|
List<CourseSchedule> collect = vipGroupDetail.getCourseSchedules().stream()
|
|
|
.sorted(Comparator.comparing(CourseSchedule::getStartClassTime))
|
|
|
.collect(Collectors.toList());
|
|
|
+ // 排序后的课程重新赋值
|
|
|
vipGroupDetail.setCourseSchedules(collect);
|
|
|
vipGroupDetail.setTotalClassTimes(collect.size());
|
|
|
}
|
|
|
@@ -4420,6 +4422,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
MapUtil.populateMap(params, queryInfo);
|
|
|
// VIP小课
|
|
|
List<StudentVipGroupShowListDto> vipGroups = vipGroupDao.findVipGroups(params);
|
|
|
+ // TODO: 直播课
|
|
|
+
|
|
|
// 网课
|
|
|
vipGroups.addAll(practiceGroupService.findPracticeGroups(params));
|
|
|
// 删除返回null值数据
|
