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

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/constant/ShoppingCartConstant.java

@@ -61,5 +61,9 @@ public class ShoppingCartConstant {
     public static final int PRODUCT_GROUP_EMPTY= 109;
     public static final String CART_PRODUCT_GROUP_EMPTY_STATE = "您选择的【$spuName】商品有未选商品";
 
+    /**
+     * 可选商品价格校验失败
+     */
+    public static final int PRODUCT_GROUP_PRICE_CHANGE = 113;
 }
 

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

@@ -1706,6 +1706,11 @@ public class ShoppingCartMCoffeeServiceImpl {
                                         validateResult.getFailureList().stream().map(ValiadShopProductResult::getProductType).collect(Collectors.toList());
                                 shoppingCartConvertAdapter.updateCartGoodsInfoForMCoffee(cartGoods, productList);
                             }
+                            if (PRODUCT_GROUP_PRICE_CHANGE == validaProduct.getCode()) {
+                                changePriceSpu.add(spuName);
+                                List<ProductBeanDTO> productList = validateResult.getFailureList().stream().map(ValiadShopProductResult::getProductType).collect(Collectors.toList());
+                                shoppingCartConvertAdapter.updateCartGoodsInfoForMCoffee(cartGoods, productList);
+                            }
                             if (PRODUCT_GROUP_EMPTY == validaProduct.getCode()) {
                                 cartGoodsStates.setHasInvalidGoods(true);
                                 cartGoods.setCartGoodsUid(null);