|
@@ -206,7 +206,7 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
|
|
|
for (EhsdPurchaseVo record : records) {
|
|
|
//赋值退货金额、应付金额
|
|
|
List<PurchaseBack> purchaseBackList = purchaseBackMap.getOrDefault(record.getId(), new ArrayList<>());
|
|
|
- BigDecimal backAmount = purchaseBackList.stream().map(PurchaseBack::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
+ BigDecimal backAmount = purchaseBackList.stream().filter(item -> ObjectUtil.isNotEmpty(item.getAmount())).map(PurchaseBack::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
record.setBackAmount(backAmount);
|
|
|
record.setPayableAmount(record.getAmount().subtract(backAmount));
|
|
|
}
|