fix 线上基础技能课，调整人数课酬bug

mec-biz/src/main/java/com/ym/mec/biz/service/ClassGroupStudentMapperService.java

@@ -27,7 +27,7 @@ public interface ClassGroupStudentMapperService extends BaseService<Long, ClassG
      * @param classGroupId
      * @return
      */
-    boolean delClassGroupStudent(Integer userId, Integer classGroupId) throws Exception;
+    boolean delClassGroupStudent(Integer userId, Integer classGroupId);
 
 
     /**

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupStudentMapperServiceImpl.java

@@ -67,11 +67,11 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean delClassGroupStudent(Integer userId, Integer classGroupId) throws Exception {
+    public boolean delClassGroupStudent(Integer userId, Integer classGroupId) {
         ClassGroup classGroup = classGroupService.get(classGroupId);
         Integer studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(classGroupId);
         if (classGroup.getType().equals(ClassGroupTypeEnum.HIGH_ONLINE) && studentNum <= 3) {
-            throw new BizException("线上基础技能课班级人数不能少于3");
+            throw new BizException(classGroup.getName()+"（线上基础技能课班级）人数不能少于3,请调整");
         }
 
         ClassGroupStudentMapper classStudentMapper = findClassStudentMapperByUserIdAndClassGroupId(userId, classGroupId, "NORMAL");

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -146,6 +146,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     private MusicGroupSubjectGoodsGroupService musicGroupSubjectGoodsGroupService;
     @Autowired
     private GoodsService goodsService;
+    @Autowired
+    private ClassGroupStudentMapperService classGroupStudentMapperService;
 
     @Autowired
     private ImFeignService imFeignService;
@@ -1355,31 +1357,11 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             if (studentRegistration == null) {
                 throw new BizException("用户注册信息不存在");
             }
-            //更新学员在班级的状态
-            classGroupStudentMapperDao.deleteStudentByMusicGroupId(musicGroupId, userId);
 
             List<Integer> classGroupIdList = classGroupStudentMapperDao.queryClassGroupIdList(musicGroupId, userId, GroupType.MUSIC);
-            if (classGroupIdList != null && classGroupIdList.size() > 0) {
-                //更新班级人数
-                //classGroupDao.batchUpdateStudentNumMinusOne(classGroupIdList);
-
-                List<ImGroupModel> imGroupModels = new ArrayList<>();
-                ImGroupMember[] imGroupMember = {new ImGroupMember(userId.toString())};
-                for (Integer classGroupId : classGroupIdList) {
-                    imGroupModels.add(new ImGroupModel(classGroupId + "", imGroupMember, ""));
-                }
-                imFeignService.groupBatchQuit(imGroupModels);
-            }
-
-            List<CourseSchedule> musicGroupCourseSchedules = courseScheduleDao.findMusicGroupCourseSchedulesWithStudent(musicGroupId, GroupType.MUSIC.getCode(), CourseStatusEnum.NOT_START.getCode(), userId);
-            if (!CollectionUtils.isEmpty(musicGroupCourseSchedules)) {
-                List<Long> courseScheduleIds = musicGroupCourseSchedules.stream().map(courseSchedule -> courseSchedule.getId()).collect(Collectors.toList());
-
-                // 删除未上课
-                courseScheduleDao.deleteMusicGroupCourseSchedulesWithStudent(courseScheduleIds, userId);
-
-                //删除学生缴费表
-                courseScheduleStudentPaymentDao.deleteStudentCourseSchedule(userId, musicGroupCourseSchedules);
+            //更新学员在班级的状态
+            for (Integer classGroupId : classGroupIdList) {
+                classGroupStudentMapperService.delClassGroupStudent(userId,classGroupId);
             }
 
             //删除续费周期
@@ -1472,32 +1454,10 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (studentRegistration == null) {
             throw new BizException("用户注册信息不存在");
         }
-        //更新学员在班级的状态
-        classGroupStudentMapperDao.deleteStudentByMusicGroupId(musicGroupId, userId);
 
         List<Integer> classGroupIdList = classGroupStudentMapperDao.queryClassGroupIdList(musicGroupId, userId, GroupType.MUSIC);
-        if (classGroupIdList != null && classGroupIdList.size() > 0) {
-            //更新班级人数
-            //classGroupDao.batchUpdateStudentNumMinusOne(classGroupIdList);
-
-            //删除融云群
-            List<ImGroupModel> imGroupModels = new ArrayList<ImGroupModel>();
-            ImGroupMember[] imGroupMember = {new ImGroupMember(userId.toString())};
-            for (Integer classGroupId : classGroupIdList) {
-                imGroupModels.add(new ImGroupModel(classGroupId + "", imGroupMember, ""));
-            }
-            imFeignService.groupBatchQuit(imGroupModels);
-        }
-
-        List<CourseSchedule> musicGroupCourseSchedules = courseScheduleDao.findMusicGroupCourseSchedulesWithStudent(musicGroupId, GroupType.MUSIC.getCode(), CourseStatusEnum.NOT_START.getCode(), userId);
-        if (!CollectionUtils.isEmpty(musicGroupCourseSchedules)) {
-            List<Long> courseScheduleIds = musicGroupCourseSchedules.stream().map(courseSchedule -> courseSchedule.getId()).collect(Collectors.toList());
-
-            // 删除未上课
-            courseScheduleDao.deleteMusicGroupCourseSchedulesWithStudent(courseScheduleIds, userId);
-
-            // 删除学生缴费表
-            courseScheduleStudentPaymentDao.deleteStudentCourseSchedule(userId, musicGroupCourseSchedules);
+        for (Integer classGroupId : classGroupIdList) {
+            classGroupStudentMapperService.delClassGroupStudent(userId,classGroupId);
         }
 
         //删除续费周期