|
@@ -2175,14 +2175,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
classGroup.setStudentNum(studentNum);
|
|
classGroup.setStudentNum(studentNum);
|
|
if(classGroup.getGroupType().equals(GroupType.VIP)){
|
|
if(classGroup.getGroupType().equals(GroupType.VIP)){
|
|
VipGroup vipGroup=vipGroupDao.get(Long.parseLong(classGroup.getMusicGroupId()));
|
|
VipGroup vipGroup=vipGroupDao.get(Long.parseLong(classGroup.getMusicGroupId()));
|
|
- Date minClassDate = courseScheduleDao.getMinCourseTime(GroupType.VIP, vipGroup.getId().toString());
|
|
|
|
- if(Objects.nonNull(minClassDate)){
|
|
|
|
- vipGroup.setCourseStartDate(minClassDate);
|
|
|
|
- }
|
|
|
|
- Date maxClassDate = courseScheduleDao.getMaxCourseTime(GroupType.VIP, vipGroup.getId().toString());
|
|
|
|
- if(Objects.nonNull(maxClassDate)){
|
|
|
|
- vipGroup.setCoursesExpireDate(maxClassDate);
|
|
|
|
- }
|
|
|
|
if (currentClassTimes<totalClassTimes
|
|
if (currentClassTimes<totalClassTimes
|
|
&&vipGroup.getStatus().equals(VipGroupStatusEnum.FINISHED)){
|
|
&&vipGroup.getStatus().equals(VipGroupStatusEnum.FINISHED)){
|
|
vipGroup.setStatus(VipGroupStatusEnum.PROGRESS);
|
|
vipGroup.setStatus(VipGroupStatusEnum.PROGRESS);
|