Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa

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

@@ -512,7 +512,7 @@ public class ShoppingCartConvertAdapter {
             if (ObjectUtils.equals(com.freemud.sdk.api.assortment.shoppingcart.constant.GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType(), cartGoods.getGoodsType())){
                 int price =
                         (null == cartGoods.getProductGroupList() ? 0 :
-                                cartGoods.getProductGroupList().stream().mapToInt(t -> t.getFinalPrice().intValue() * t.getQty()).sum())
+                                cartGoods.getProductGroupList().stream().mapToInt(t -> (null == t.getFinalPrice() ? 0 : t.getFinalPrice().intValue()) * t.getQty()).sum())
                                 + cartGoods.getFinalPrice().intValue();
                 productType.setPrice(price);
             }else{