|
@@ -1151,7 +1151,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
checkNewCourseSchedules(courseSchedules, false);
|
|
|
courseScheduleDao.batchUpdate(courseSchedules);
|
|
|
classGroupService.updateClassGroupInfo(classGroup.getId());
|
|
|
- vipGroupService.checkVipCourseIsInScore(vipGroupCourseAdjustInfo.getVipGroupId().longValue());
|
|
|
+// vipGroupService.checkVipCourseIsInScore(vipGroupCourseAdjustInfo.getVipGroupId().longValue());
|
|
|
// courseScheduleStudentPaymentService.updateVipGiveCourse(vipGroup.getId());
|
|
|
}
|
|
|
|
|
@@ -1325,7 +1325,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
vipGroupApplyDto.setSingleClassPrice(vipGroupCourseAdjustInfo.getSingleClassPrice());
|
|
|
vipGroupService.appendVipGroupCourseSchedules(vipGroupApplyDto);
|
|
|
classGroupService.updateClassGroupInfo(classGroup.getId());
|
|
|
- vipGroupService.checkVipCourseIsInScore(vipGroupCourseAdjustInfo.getVipGroupId().longValue());
|
|
|
+// vipGroupService.checkVipCourseIsInScore(vipGroupCourseAdjustInfo.getVipGroupId().longValue());
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -1418,10 +1418,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
checkNewCourseSchedules(newCourseSchedules, false);
|
|
|
//课程调整
|
|
|
classStartDateAdjust(newCourseSchedules);
|
|
|
-
|
|
|
- if (!CollectionUtils.isEmpty(oldCourseScheduleIds)&&oldCourseScheduleIds.get(0).getGroupType().equals(GroupType.VIP)){
|
|
|
- vipGroupService.checkVipCourseIsInScore(Long.valueOf(oldCourseScheduleIds.get(0).getMusicGroupId()));
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -1642,6 +1638,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
studentAttendanceDao.deleteByCourseSchedules(needCreateStudentPaymentCourses.stream().map(CourseSchedule::getId).collect(Collectors.toList()));
|
|
|
}
|
|
|
|
|
|
+ if (!sysUser.getUserType().contains("SYSTEM") && sysUser.getUserType().contains("TEACHER")) {
|
|
|
+ if (!CollectionUtils.isEmpty(oldCourseScheduleList) && oldCourseScheduleList.get(0).getGroupType().equals(GroupType.VIP)) {
|
|
|
+ vipGroupService.checkVipCourseIsInScore(Long.valueOf(oldCourseScheduleList.get(0).getMusicGroupId()));
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
// if(oldCourseScheduleList.get(0).getGroupType().equals(GroupType.VIP)){
|
|
|
// courseScheduleStudentPaymentService.updateVipGiveCourse(Long.valueOf(oldCourseScheduleList.get(0).getMusicGroupId()));
|
|
|
// }
|