sunyu::fix bug about combo-product calculate price

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -510,8 +510,8 @@ public class ShoppingCartConvertAdapter {
             // 普通商品，取商品的finalePrice(普通商品售价);套餐商品，取originalPrice(套餐价格)
             if (ObjectUtils.equals(com.freemud.sdk.api.assortment.shoppingcart.constant.GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType(), cartGoods.getGoodsType())){
                 int price =
-                        cartGoods.getProductGroupList().stream().mapToInt(t -> t.getFinalPrice().intValue() * t.getQty()).sum()
-                                + cartGoods.getProductMaterialList().stream().mapToInt(t-> t.getFinalPrice().intValue()).sum()
+                        (null == cartGoods.getProductGroupList() ? 0 :
+                                cartGoods.getProductGroupList().stream().mapToInt(t -> t.getFinalPrice().intValue() * t.getQty()).sum())
                                 + cartGoods.getFinalPrice().intValue();
                 productType.setPrice(price);
             }else{

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/SetMealCalculation.java

@@ -65,7 +65,9 @@ public class SetMealCalculation {
             cartGoods.setPackPrice(cartGoods.getPackPrice() * cartGoods.getQty());
             // 可选商品现总价
             productGroupTotalAmount = 0l;
-            long productGroupAmount = cartGoods.getProductGroupList().stream().mapToLong(t -> t.getFinalPrice() * t.getQty()).sum();
+            long productGroupAmount =
+                    null == cartGoods.getProductGroupList() ? 0 :
+                            cartGoods.getProductGroupList().stream().mapToLong(t -> t.getFinalPrice() * t.getQty()).sum();
             productGroupTotalAmount += productGroupAmount * cartGoods.getQty();
 
             // 固定商品现总价