|
@@ -1820,12 +1820,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
}
|
|
|
List<Map<Integer, BigDecimal>> maps = vipGroupDao.countSurplusCourseFee(vipGroupId);
|
|
|
if(CollectionUtils.isEmpty(maps)||(maps.size()==1&&Objects.isNull(maps.get(0)))){
|
|
|
- vipGroup.setStatus(VipGroupStatusEnum.CANCEL);
|
|
|
- vipGroupDao.update(vipGroup);
|
|
|
- if(vipGroup.getStatus().equals(VipGroupStatusEnum.PROGRESS)){
|
|
|
+ if(courseScheduleIds != null && courseScheduleIds.size() > 0){
|
|
|
courseScheduleDao.batchDeleteCourseSchedules(courseScheduleIds);
|
|
|
courseScheduleTeacherSalaryDao.batchDeleteByCourseScheduleIds(courseScheduleIds);
|
|
|
}
|
|
|
+ vipGroup.setStatus(VipGroupStatusEnum.CANCEL);
|
|
|
+ vipGroupDao.update(vipGroup);
|
|
|
stopVipPush(vipGroup.getId(),vipGroup.getName());
|
|
|
return;
|
|
|
}
|