yzc 1 سال پیش
والد
کامیت
4bc30ac3a5
1فایلهای تغییر یافته به همراه1 افزوده شده و 1 حذف شده
  1. 1 1
      hx-sale/src/main/java/com/fjhx/sale/service/purchase/impl/EhsdPurchaseServiceImpl.java

+ 1 - 1
hx-sale/src/main/java/com/fjhx/sale/service/purchase/impl/EhsdPurchaseServiceImpl.java

@@ -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));
         }