Browse Source

退学删除学员考勤

zouxuan 2 years ago
parent
commit
373cb8113d

+ 2 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -408,7 +408,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     public void batchDeleteMusicGroupCourseWithStudent(String musicGroupId, Integer userId, GroupType groupType) {
     public void batchDeleteMusicGroupCourseWithStudent(String musicGroupId, Integer userId, GroupType groupType) {
         if (StringUtils.isBlank(musicGroupId)) {
         if (StringUtils.isBlank(musicGroupId)) {
-            throw new BizException("请指定乐团");
+            throw new BizException("请指定课程组");
         }
         }
         List<CourseSchedule> musicGroupCourseSchedules = courseScheduleDao.findMusicGroupCourseSchedulesWithStudent(musicGroupId, groupType.getCode(), CourseStatusEnum.NOT_START.getCode(), userId);
         List<CourseSchedule> musicGroupCourseSchedules = courseScheduleDao.findMusicGroupCourseSchedulesWithStudent(musicGroupId, groupType.getCode(), CourseStatusEnum.NOT_START.getCode(), userId);
         if (!CollectionUtils.isEmpty(musicGroupCourseSchedules)) {
         if (!CollectionUtils.isEmpty(musicGroupCourseSchedules)) {
@@ -416,6 +416,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                     .map(courseSchedule -> courseSchedule.getId())
                     .map(courseSchedule -> courseSchedule.getId())
                     .collect(Collectors.toList());
                     .collect(Collectors.toList());
             courseScheduleDao.deleteMusicGroupCourseSchedulesWithStudent(courseScheduleIds, userId);
             courseScheduleDao.deleteMusicGroupCourseSchedulesWithStudent(courseScheduleIds, userId);
+			studentAttendanceDao.deleteByCourseAndUser(courseScheduleIds,userId)
         }
         }
     }
     }
 
 

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

@@ -3032,17 +3032,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         if (classStudentMapperByUserIdAndClassGroupId.getStatus().equals(ClassGroupStudentStatusEnum.QUIT)) {
         if (classStudentMapperByUserIdAndClassGroupId.getStatus().equals(ClassGroupStudentStatusEnum.QUIT)) {
             throw new BizException("当前学生已经是退学状态");
             throw new BizException("当前学生已经是退学状态");
         }
         }
-        /*BigDecimal amount = returnFeeDto.getAmount();
-        if (!classStudentMapperByUserIdAndClassGroupId.getStatus().equals(ClassGroupStudentStatusEnum.QUIT_SCHOOL)) {
-            if (Objects.isNull(amount)) {
-                throw new BizException("请确定退费金额");
-            }
-            Map<String, BigDecimal> studentSurplusCourseFee = getStudentSurplusCourseFee(vipGroupId, studentId);
-            BigDecimal suplusCourseFee = studentSurplusCourseFee.get("suplusCourseOriginalFee");
-            if (amount.compareTo(suplusCourseFee) > 0) {
-                throw new BizException("学员最大可退费金额为{}元", suplusCourseFee.toString());
-            }
-        }*/
         GroupType groupType = GroupType.VIP;
         GroupType groupType = GroupType.VIP;
         if("LIVE".equals(vipGroup.getGroupType())){
         if("LIVE".equals(vipGroup.getGroupType())){
             groupType = GroupType.LIVE;
             groupType = GroupType.LIVE;