运费计算封装

fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreOrderServiceImpl.java

@@ -1398,6 +1398,9 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             storeOrder.setTotalPostage(BigDecimal.ZERO);
             // 计算运费
             BigDecimal postMoney = calPostMoney(storeProductPackage, address);
+            if(postMoney == null) {
+                postMoney = BigDecimal.ZERO;
+            }
             storeOrder.setPayPostage(postMoney);
 
             storeOrder.setDeductionPrice(BigDecimal.ZERO);
@@ -1418,7 +1421,11 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             productPackage.setTitle(storeProductPackage.getTitle());
             productPackage.setImgUrl(storeProductPackage.getImgUrl());
             productPackage.setDescs(storeProductPackage.getDescs());
-            productPackage.setPayMoney(storeOrder.getPayMoney().add(postMoney));
+            BigDecimal payMoney = storeOrder.getPayMoney();
+            if(payMoney == null) {
+                payMoney = BigDecimal.ZERO;
+            }
+            productPackage.setPayMoney(payMoney.add(postMoney));
             productPackage.setPackageId(storeProductPackage.getPackageId());
             storeOrder.setPackageJson(JSONUtil.toJsonStr(productPackage));
             storeOrder.setPackageId(storeProductPackage.getPackageId());