|
@@ -482,6 +482,17 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
|
|
|
if (musicGroupPurchaseListCount.size() > 0) {
|
|
|
throw new BizException("乐器清单已确认,不能做声部更改");
|
|
|
}
|
|
|
+
|
|
|
+ Integer userId = subjectChange.getStudentId();
|
|
|
+
|
|
|
+ //乐器已发货,不能做声部更换
|
|
|
+ List<StudentPaymentOrderDetail> originalStudentPaymentOrderDetailList = studentPaymentOrderDetailDao.findUserApplyOrder(userId, musicGroupId,
|
|
|
+ DealStatusEnum.SUCCESS);
|
|
|
+ originalStudentPaymentOrderDetailList = originalStudentPaymentOrderDetailList.stream().filter(t -> StringUtils.isNotBlank(t.getDeliveryBatchNo()))
|
|
|
+ .collect(Collectors.toList());
|
|
|
+ if (originalStudentPaymentOrderDetailList != null && originalStudentPaymentOrderDetailList.size() > 0) {
|
|
|
+ throw new BizException("当前学生乐器已发货,不能做声部更改");
|
|
|
+ }
|
|
|
|
|
|
//判断新声部人数是否已满
|
|
|
MusicGroupSubjectPlan changeSubjectPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(musicGroupId, subjectChange.getChangeSubjectId());
|