|
@@ -147,12 +147,12 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
throw new BizException("请登录");
|
|
|
}
|
|
|
// 所有缴费项目已完成排课才能创建下一个缴费项目
|
|
|
- String organBatchNo = musicGroupPaymentStudentCourseDetailDao.getUnUseBatchNoWithStudentAndCourseTypeAndCourseMinutes(musicGroupId, null, null, musicGroupPaymentCalenderDto.getIgnoreBatchNoList());
|
|
|
+ /*String organBatchNo = musicGroupPaymentStudentCourseDetailDao.getUnUseBatchNoWithStudentAndCourseTypeAndCourseMinutes(musicGroupId, null, null, musicGroupPaymentCalenderDto.getIgnoreBatchNoList());
|
|
|
if (StringUtils.isNoneBlank(organBatchNo)) {
|
|
|
if (StringUtils.isEmpty(musicGroupPaymentCalenderDto.getBatchNo()) || !musicGroupPaymentCalenderDto.getBatchNo().equals(organBatchNo)) {
|
|
|
throw new BizException("当前乐团存在未排课的缴费项目,请先完成排课再操作");
|
|
|
}
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
List<MusicGroupPaymentCalenderStudentDetail> calenderStudentDetails = musicGroupPaymentCalenderDto.getMusicGroupPaymentCalenderStudentDetails();
|
|
|
|
|
@@ -247,10 +247,10 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
throw new BizException("创建缴费失败:已存在缴费项目");
|
|
|
}
|
|
|
// 所有缴费项目已完成排课才能创建下一个缴费项目
|
|
|
- String orignBatchNo = musicGroupPaymentStudentCourseDetailDao.getUnUseBatchNoWithStudentAndCourseTypeAndCourseMinutes(musicGroupId, null, null, null);
|
|
|
+ /*String orignBatchNo = musicGroupPaymentStudentCourseDetailDao.getUnUseBatchNoWithStudentAndCourseTypeAndCourseMinutes(musicGroupId, null, null, null);
|
|
|
if (StringUtils.isNoneBlank(orignBatchNo)) {
|
|
|
throw new BizException("当前乐团存在未排课的缴费项目,请先完成排课再操作");
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
// 不是进行中,只能创建一次缴费
|
|
|
if (musicGroup.getStatus() != MusicGroupStatusEnum.PROGRESS) {
|