|
@@ -4939,14 +4939,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
}
|
|
|
|
|
|
// 设置课程
|
|
|
- List<CourseSchedule> courseSchedules = JSON.parseArray(baseInfoDto.getCourseSchedulesJson(), CourseSchedule.class);
|
|
|
- if (vipGroup.getStatus().equals(VipGroupStatusEnum.PROGRESS)) {
|
|
|
- // 修改课程信息
|
|
|
- ClassGroup classGroup = classGroupDao.findByVipGroup(vipGroup.getId(), GroupType.LIVE.getCode());
|
|
|
-
|
|
|
- // 查询未开始课程信息
|
|
|
- courseSchedules = courseScheduleDao.findClassGroupCourseSchedules(classGroup.getId());
|
|
|
-
|
|
|
+ List<CourseSchedule> courseSchedules = courseScheduleDao.findGroupCourseSchedules(vipGroup.getId().toString(), GroupType.LIVE.getCode());
|
|
|
+ if(CollectionUtils.isEmpty(courseSchedules)){
|
|
|
+ courseSchedules = JSON.parseArray(baseInfoDto.getCourseSchedulesJson(), CourseSchedule.class);
|
|
|
}
|
|
|
vipGroupApplyDto.setCourseSchedules(courseSchedules);
|
|
|
|