Merge remote-tracking branch 'origin/qa' into qa

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

@@ -37,15 +37,17 @@ public class ShoppingCartConstant {
      * 商品价格校验失败
      */
     public static final int PRODUCT_PRICE_CHANGE = 102;
+    public static final String CART_PRODUCT_PRICE_CHANGE = "您选择的【$spuName】商品价格将发生变化";
 
     /**
      * 商品不存在
      */
     public static final int PRODUCT_NOTFOUND= 103;
-
+    public static final String CART_PRODUCT_NOT_FOUND = "您选择的【$spuName】商品不在当前门店菜单中";
     /**
      * 商品状态校验失败
      */
     public static final int PRODUCT_DOWN= 104;
+    public static final String CART_PRODUCT_INVALID_STATE = "您选择的【$spuName】商品已失效";
 }
 

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/ShoppingCartBaseService.java

@@ -214,29 +214,29 @@ public interface ShoppingCartBaseService {
             if (CollectionUtils.isNotEmpty(validateResult.getFailureList())){
                 for (int i = 0; i < validateResult.getFailureList().size(); i++) {
                     checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
-                    switch (validateResult.getFailureList().get(i).getCode()){
+                    ValiadShopProductResult validaProduct = validateResult.getFailureList().get(i);
+                    checkCartRequest.getCartGoodsList().forEach(cartGoods -> {
+                        String spuName = cartGoods.getSkuId().equals(validaProduct.getSkuId()) ? cartGoods.getSpuName() : "";
+                        switch (validaProduct.getCode()){
                             case PRODUCT_PRICE_CHANGE :
-                            checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_ACTIVITY_CHANGE);
+                                checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(CART_PRODUCT_PRICE_CHANGE.replace("$spuName",spuName));
+                                List<ProductBeanDTO> productList = validateResult.getFailureList().stream().map(ValiadShopProductResult::getProductType).collect(Collectors.toList());
+                                shoppingCartAdapter.updateCartGoodsInfoNew(cartGoods, productList);
                                 break;
                             case PRODUCT_NOTFOUND:
-                            checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_EMPTY_GOODS_LIST);
+                                cartGoods.setCartGoodsUid(null);
+                                checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(CART_PRODUCT_NOT_FOUND.replace("$spuName",spuName));
                                 break;
                             case PRODUCT_DOWN:
-                            checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_INVALID_GOODS_EXIST);
+                                cartGoods.setCartGoodsUid(null);
+                                checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(CART_PRODUCT_INVALID_STATE.replace("$spuName",spuName));
                                 break;
                             default:
                                 break;
                         }
-//                    return CartResponseUtil.error(valiadResponse.getMessage(),checkCartRequest);
+                    });
                 }
                 setToastMsgIfNotExist(checkCartRequest.getShoppingCartGoodsResponseVo(), ShoppingCartConstant.SHOPPING_CART_GOODS_CHANGE);
-                for (CartGoods cartGoods :checkCartRequest.getCartGoodsList()) {
-                    if (validateResult.getFailureList().stream().anyMatch(f->cartGoods.getCartGoodsUid().equals(f.getUuid()))){
-                        cartGoods.setCartGoodsUid(null);
-                        checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
-                        checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_INVALIAD_GOODS);
-                    }
-                }
                 checkCartRequest.getCartGoodsList().removeIf(k ->  StringUtils.isEmpty(k.getCartGoodsUid()));
             }
             List<ProductBeanDTO> productList = validateResult.getSuccessList().stream().map(ValiadShopProductResult::getProductType).collect(Collectors.toList());