问题处理

hx-sale/src/main/java/com/fjhx/sale/flow/PayFlow.java

@@ -1,5 +1,6 @@
 package com.fjhx.sale.flow;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -199,7 +200,7 @@ public class PayFlow extends FlowDelegate {
 //            BigDecimal amount = purchase.getAmount();
             //获取应付金额
             List<PurchaseBack> purchaseBackList = purchaseBackMap.getOrDefault(purchase.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);
             BigDecimal payableAmount = purchase.getAmount().subtract(backAmount);
 
             // 合同付款金额大于等于应付金额，已付款

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

@@ -623,7 +623,7 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
 
             //赋值退货金额、应付金额
             List<PurchaseBack> purchaseBackList = purchaseBackMap.getOrDefault(p.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);
             p.setBackAmount(backAmount);
             p.setPayableAmount(p.getAmount().subtract(backAmount));
         }