|
@@ -440,8 +440,11 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- Set<Integer> refundSellOrderGoodsIds = getRefundGoodsId(details.stream().map(t -> t.getPaymentOrderId()).collect(Collectors.toList()));
|
|
|
-
|
|
|
+ Set<Integer> refundSellOrderGoodsIds = new HashSet<Integer>();
|
|
|
+ if (details.size() > 0) {
|
|
|
+ refundSellOrderGoodsIds = getRefundGoodsId(details.stream().map(t -> t.getPaymentOrderId()).collect(Collectors.toList()));
|
|
|
+ }
|
|
|
+
|
|
|
MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
|
|
|
subjectChange.setStudentId(studentId);
|
|
|
subjectChange.setOrganId(musicGroup.getOrganId());
|
|
@@ -489,7 +492,10 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
|
|
|
subjectChange.setOriginalAccessoriesPrice(price);
|
|
|
}
|
|
|
//2.2 计算销售成本
|
|
|
- BigDecimal orderSellCost = sellOrderDao.getOrderSellCost(paymentOrderIdList);
|
|
|
+ BigDecimal orderSellCost = BigDecimal.ZERO;
|
|
|
+ if (paymentOrderIdList != null && paymentOrderIdList.size() > 0) {
|
|
|
+ orderSellCost = sellOrderDao.getOrderSellCost(paymentOrderIdList);
|
|
|
+ }
|
|
|
subjectChange.setOriginalCost(orderSellCost == null ? BigDecimal.ZERO : orderSellCost);
|
|
|
return subjectChange;
|
|
|
}
|