Merge branch 'feature-yu.sun-20200915-new' into qa

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

@@ -249,7 +249,7 @@ public interface ShoppingCartBaseService {
                     ValiadShopProductResult validaProduct = validateResult.getFailureList().get(i);
                     for (CartGoods cartGoods : checkCartRequest.getCartGoodsList()) {
                         checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
-                        if (cartGoods.getCartGoodsUid().equals(validaProduct.getUuid())) {
+                        if (cartGoods.getSkuId().equals(validaProduct.getSkuId())) {
                             String spuName = null == validaProduct.getProductType() ? (StringUtils.isNotEmpty(cartGoods.getSkuName()) ? cartGoods.getSkuName() :
                                             StringUtils.isNotEmpty(cartGoods.getName()) ? cartGoods.getName() : "") : validaProduct.getProductType().getName();
                             if (PRODUCT_DOWN == validaProduct.getCode()) {