|
@@ -448,7 +448,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
//乐器及打包辅件
|
|
|
List<MusicGroupSubjectGoodsGroup> goodsGroups = new ArrayList<>();
|
|
|
if (studentRegistration.getTemporaryCourseFee() != null) {
|
|
|
- List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailService.findUserApplyOrder(studentRegistration.getUserId(), DealStatusEnum.WAIT_PAY);
|
|
|
+ List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailService.findUserApplyOrder(studentRegistration.getUserId(),studentRegistration.getMusicGroupId(), DealStatusEnum.WAIT_PAY);
|
|
|
for (StudentPaymentOrderDetail orderDetail : orderDetails) {
|
|
|
if (orderDetail == null || orderDetail.getPrice() == null || orderDetail.getGoodsIdList() == null) {
|
|
|
continue;
|
|
@@ -654,7 +654,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
//乐器及打包辅件
|
|
|
List<MusicGroupSubjectGoodsGroup> goodsGroups = new ArrayList<>();
|
|
|
if (studentRegistration.getTemporaryCourseFee() != null) {
|
|
|
- List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailService.findUserApplyOrder(studentRegistration.getUserId(), DealStatusEnum.WAIT_PAY);
|
|
|
+ List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailService.findUserApplyOrder(studentRegistration.getUserId(),studentRegistration.getMusicGroupId(), DealStatusEnum.WAIT_PAY);
|
|
|
for (StudentPaymentOrderDetail orderDetail : orderDetails) {
|
|
|
if (orderDetail == null || orderDetail.getPrice() == null || orderDetail.getGoodsIdList() == null) {
|
|
|
continue;
|