Переглянути джерело

1、停课时删除未上课时

Joburgess 5 роки тому
батько
коміт
2334470a5a

+ 3 - 3
mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -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;
 		}