fix

shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/AbstractApportionService.java

@@ -388,10 +388,12 @@ public class AbstractApportionService implements GetShoppingCartGoodsApportionSe
         /**
          * 用促销价格初始化购物车行记录成交价
          */
-        ShoppingGoodsAmountBO shoppingGoodsAmountBO = this.initShoppingCart(distributeBO.getCalculationDiscountBO().getResult(), distributeBO.getCartGoods());
-
-        CalculationDiscountBO.CalculationDiscountResult discountResult = distributeBO.getCalculationDiscountBO().getResult();
+        ShoppingGoodsAmountBO shoppingGoodsAmountBO = this.initShoppingCart(distributeBO.getCalculationDiscountBO(), distributeBO.getCartGoods());
 
+        CalculationDiscountBO.CalculationDiscountResult discountResult = null;
+        if (distributeBO.getCalculationDiscountBO() != null){
+            discountResult = distributeBO.getCalculationDiscountBO().getResult();
+        }
 
         /**
          * 组建大的优惠信息
@@ -400,6 +402,7 @@ public class AbstractApportionService implements GetShoppingCartGoodsApportionSe
         shoppingCartGoodsBO.setActivityDiscountsDtos(activityDiscountsDtos);
 
 
+
         /**
          * 活动库存
          * 过滤出加价购
@@ -1477,7 +1480,7 @@ public class AbstractApportionService implements GetShoppingCartGoodsApportionSe
     /**
      * 初始化价格
      */
-    public ShoppingGoodsAmountBO initShoppingCart(CalculationDiscountBO.CalculationDiscountResult discountResult
+    public ShoppingGoodsAmountBO initShoppingCart(CalculationDiscountBO calculationDiscountBO
             , List<CartGoods> cartGoodsList) {
         ShoppingGoodsAmountBO shoppingGoodsAmountBO = new ShoppingGoodsAmountBO();
 
@@ -1485,7 +1488,10 @@ public class AbstractApportionService implements GetShoppingCartGoodsApportionSe
          * 使用促销算价赋值行记录
          */
         List<CalculationDiscountBO.CalculationDiscountResult.Goods> goods = null;
-        if (discountResult != null && CollectionUtils.isNotEmpty(discountResult.getGoods())) {
+        CalculationDiscountBO.CalculationDiscountResult discountResult = null;
+
+        if (calculationDiscountBO != null && calculationDiscountBO.getResult() != null && CollectionUtils.isNotEmpty(calculationDiscountBO.getResult().getGoods())) {
+            discountResult = calculationDiscountBO.getResult();
             goods = discountResult.getGoods();
         }
         long totalOriginalAmount = 0L, totalAmount = 0L, totalPackageAmount = 0L;