|
@@ -1805,10 +1805,13 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
int studentCourseNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(classGroup.getId());
|
|
|
if(studentCourseNum<=0&&classGroup.getStudentNum().equals(classGroup.getExpectStudentNum())){
|
|
|
vipGroup.setStatus(VipGroupStatusEnum.PAUSE);
|
|
|
- if(!CollectionUtils.isEmpty(courseScheduleIds)){
|
|
|
- courseScheduleTeacherSalaryDao.batchDeleteByCourseScheduleIds(courseScheduleIds);
|
|
|
- courseScheduleDao.batchDeleteCourseSchedules(courseScheduleIds);
|
|
|
- teacherAttendanceDao.batchDeleteByCourseSchedules(courseScheduleIds);
|
|
|
+ int notStartCourseStudentNum = courseScheduleStudentPaymentDao.countNotStartCourseStudentNumWithGroup(vipGroupId.toString(), GroupType.VIP);
|
|
|
+ if(notStartCourseStudentNum<=0){
|
|
|
+ List<CourseSchedule> groupNotFinishCourses = courseScheduleDao.findGroupNotFinishCourses(vipGroupId.toString(), GroupType.VIP);
|
|
|
+ List<Long> csIds = groupNotFinishCourses.stream().map(CourseSchedule::getId).collect(Collectors.toList());
|
|
|
+ courseScheduleTeacherSalaryDao.batchDeleteByCourseScheduleIds(csIds);
|
|
|
+ courseScheduleDao.batchDeleteCourseSchedules(csIds);
|
|
|
+ teacherAttendanceDao.batchDeleteByCourseSchedules(csIds);
|
|
|
}
|
|
|
vipGroupDao.update(vipGroup);
|
|
|
}
|