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

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

@@ -250,21 +250,28 @@ public interface ShoppingCartBaseService {
                     ValiadShopProductResult validaProduct = validateResult.getFailureList().get(i);
                     for (CartGoods cartGoods : checkCartRequest.getCartGoodsList()) {
                         if (cartGoods.getSkuId().equals(validaProduct.getSkuId())) {
-                            String spuName = null == validaProduct.getProductType() ? cartGoods.getSpuName() : validaProduct.getProductType().getName();
+                            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()) {
+                                if (StringUtils.isNotEmpty(spuName)){
                                     invalidSpu.add(spuName);
+                                }
                                 cartGoodsStates.setHasInvalidGoods(true);
                                 cartGoods.setCartGoodsUid(null);
                                 break;
                             }
                             if (PRODUCT_NOTFOUND == validaProduct.getCode()) {
+                                if (StringUtils.isNotEmpty(spuName)) {
                                     notFoundSpu.add(spuName);
+                                }
                                 cartGoodsStates.setHasInvalidGoods(true);
                                 cartGoods.setCartGoodsUid(null);
                                 break;
                             }
                             if (PRODUCT_PRICE_CHANGE == validaProduct.getCode()) {
+                                if (StringUtils.isNotEmpty(spuName)) {
                                     changePriceSpu.add(spuName);
+                                }
                                 List<ProductBeanDTO> productList = validateResult.getFailureList().stream().map(ValiadShopProductResult::getProductType).collect(Collectors.toList());
                                 shoppingCartAdapter.updateCartGoodsInfoNew(cartGoods, productList);
                             }
@@ -283,7 +290,6 @@ public interface ShoppingCartBaseService {
                 if (CollectionUtils.isNotEmpty(changePriceSpu)){
                     toastMsg = toastMsg.concat(CART_PRODUCT_PRICE_CHANGE.replace("$spuName",StringUtils.join(changePriceSpu,",")));
                 }
-
                 checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(toastMsg);
 
                 setToastMsgIfNotExist(checkCartRequest.getShoppingCartGoodsResponseVo(), ShoppingCartConstant.SHOPPING_CART_GOODS_CHANGE);