进行中加学员bug修改

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

@@ -418,21 +418,20 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         sendSeoMessageSource.sendSeoMessage(musicGroup.getOrganId(), new SysUserRoleEnum[]{ORGAN_MANAGER},
                 null, null, MessageTypeEnum.BACKSTAGE_PAYMENT_CALENDER_AUDIT, organization.getName(), musicGroup.getName());
         
-        if (musicGroupPaymentCalender.getPaymentType() == PaymentType.ADD_STUDENT) {
+        if (musicGroupPaymentCalender.getPaymentType() == PaymentType.ADD_STUDENT &&
+            musicGroupPaymentCalender.getCurrentTotalAmount().compareTo(BigDecimal.ZERO) == 0
+                && musicGroupPaymentCalender.getStatus() != AUDITING ){
             addStudent(musicGroupPaymentCalender, musicGroup);
             //将0元未缴费学员缴费状态更新为已缴费
             this.updateNoPaymentAndZeroPaymentStatus(musicGroupPaymentCalender, true);
-            if (musicGroupPaymentCalender.getCurrentTotalAmount().compareTo(BigDecimal.ZERO) == 0
-                    && musicGroupPaymentCalender.getStatus() != AUDITING ){
-                // 学生加到班级
-                classGroupService.addStudentToClassGroupAndCourseArranging(calenderAddStudent.getStudentIds(), calenderAddStudent.getClassGroupIds(),
-                        batchNo, musicGroupPaymentBaseCalender.getMusicGroupPaymentCalenderCourseSettingsList(), musicGroup);
-                ExecutorService executor = Executors.newFixedThreadPool(5);
-                CompletableFuture.runAsync(() -> {
-                    imUserFriendService.refreshGroupImUserFriend(musicGroupId, GroupType.MUSIC);
-                }, executor);
-                executor.shutdown();
-            }
+            // 学生加到班级
+            classGroupService.addStudentToClassGroupAndCourseArranging(calenderAddStudent.getStudentIds(), calenderAddStudent.getClassGroupIds(),
+                    batchNo, musicGroupPaymentBaseCalender.getMusicGroupPaymentCalenderCourseSettingsList(), musicGroup);
+            ExecutorService executor = Executors.newFixedThreadPool(5);
+            CompletableFuture.runAsync(() -> {
+                imUserFriendService.refreshGroupImUserFriend(musicGroupId, GroupType.MUSIC);
+            }, executor);
+            executor.shutdown();
         }
         
         ModelMap map = new ModelMap(1);
@@ -904,13 +903,6 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
                 }
             }
             if (calender.getPaymentType() == ADD_STUDENT || calender.getPaymentType() == SPAN_GROUP_CLASS_ADJUST) {
-                // 所有缴费项目已完成排课才能创建下一个缴费项目
-//                List<String> batchNoList = new ArrayList<>();
-//                batchNoList.add(batchNo);
-//                String orignBatchNo = musicGroupPaymentStudentCourseDetailDao.getUnUseBatchNoWithStudentAndCourseTypeAndCourseMinutes(calender.getMusicGroupId(), null, null, batchNoList);
-//                if (StringUtils.isNoneBlank(orignBatchNo)) {
-//                    throw new BizException("{} 存在未排课的缴费项目，请先完成排课再操作", musicGroup.getName());
-//                }
                 List<Integer> userIds = Arrays.stream(calender.getStudentIds().split(",")).mapToInt(Integer::valueOf).boxed().collect(Collectors.toList());
                 //获取欠费学员列表
                 List<Integer> noPaymentUserIds = musicGroupPaymentCalenderDetailDao.queryNoPaymentUserIds(calender.getMusicGroupId(), userIds,null);