|
@@ -185,7 +185,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
throw new BizException("请登录");
|
|
|
}
|
|
|
// 所有缴费项目已完成排课才能创建下一个缴费项目
|
|
|
- String orignBatchNo = musicGroupPaymentStudentCourseDetailDao.getUnUseBatchNoWithStudentAndCourseTypeAndCourseMinutes(musicGroupId, null, null,null);
|
|
|
+ String orignBatchNo = musicGroupPaymentStudentCourseDetailDao.getUnUseBatchNoWithStudentAndCourseTypeAndCourseMinutes(musicGroupId, null, null,musicGroupPaymentCalenderDto.getIgnoreBatchNoList());
|
|
|
if (StringUtils.isNoneBlank(orignBatchNo)) {
|
|
|
if(StringUtils.isEmpty(musicGroupPaymentCalenderDto.getBatchNo()) || !musicGroupPaymentCalenderDto.getBatchNo().equals(orignBatchNo)){
|
|
|
throw new BizException("当前乐团存在未排课的缴费项目,请先完成排课再操作");
|
|
@@ -203,12 +203,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
PaymentCalenderStatusEnum status = PaymentCalenderStatusEnum.NO;
|
|
|
|
|
|
Date date = new Date();
|
|
|
- String batchNo;
|
|
|
- if(StringUtils.isEmpty(musicGroupPaymentCalenderDto.getBatchNo())){
|
|
|
- batchNo = idGeneratorService.generatorId() + "";
|
|
|
- }else {
|
|
|
- batchNo = musicGroupPaymentCalenderDto.getBatchNo();
|
|
|
- }
|
|
|
+ String batchNo = idGeneratorService.generatorId() + "";
|
|
|
|
|
|
// 获取设置的课程
|
|
|
List<MusicGroupPaymentCalenderCourseSettings> musicGroupPaymentCalenderCourseSettingsList = musicGroupPaymentCalenderDto
|
|
@@ -405,7 +400,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
// 如果是进行中加学生
|
|
|
if (musicGroupPaymentCalender.getPaymentType() == PaymentType.ADD_STUDENT) {
|
|
|
addStudent(musicGroupPaymentCalender, currentMusicGroupPaymentCalenderCourseSettings);
|
|
|
- }else if(StringUtils.isNotEmpty(musicGroupPaymentCalenderDto.getBatchNo())){
|
|
|
+ }else if(musicGroupPaymentCalenderDto.getMergeClassFlag()){
|
|
|
//缴费项目添加学员
|
|
|
int[] ints = Arrays.stream(musicGroupPaymentCalenderDto.getStudentIds().split(",")).mapToInt(Integer::parseInt).toArray();
|
|
|
List<Integer> list2 = Arrays.stream(ints).boxed().collect(Collectors.toList());
|