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

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

@@ -267,10 +267,10 @@ public interface ShoppingCartBaseService {
                         cartGoodsStates.setPriceChanged(true);
                         checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
                         ValiadShopProductResult validaProduct = validateResult.getFailureList().get(i);
-                        String spuName = StringUtils.isEmpty(checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg()) ? "" : checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg();
+                        String spuName =  "";
                         for (CartGoods cartGoods : checkCartRequest.getCartGoodsList()) {
-                            spuName = spuName.concat(cartGoods.getSkuId().equals(validaProduct.getSkuId()) ? cartGoods.getSpuName() : "").concat(",");
                             if (PRODUCT_PRICE_CHANGE == validaProduct.getCode()) {
+                                spuName = spuName.concat(cartGoods.getSkuId().equals(validaProduct.getSkuId()) ? cartGoods.getSpuName() : "").concat(",");
                                 List<ProductBeanDTO> productList = validateResult.getFailureList().stream().map(ValiadShopProductResult::getProductType).collect(Collectors.toList());
                                 shoppingCartAdapter.updateCartGoodsInfoNew(cartGoods, productList);
                             }
@@ -278,7 +278,10 @@ public interface ShoppingCartBaseService {
                         if (spuName.split(",").length > 1){
                             spuName.substring(0,spuName.length()-1).concat("等");
                         }
-                        checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(CART_PRODUCT_PRICE_CHANGE.replace("$spuName", spuName.replace("【","").replace("】","")));
+                        String toastMsg = StringUtils.isEmpty(checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg()) ? "" : checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg();
+                        if (!StringUtils.isEmpty(spuName)){
+                            checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(toastMsg.concat(CART_PRODUCT_PRICE_CHANGE.replace("$spuName", spuName)).replace("【","").replace("】",""));
+                        }
                     }
                 }
                 setToastMsgIfNotExist(checkCartRequest.getShoppingCartGoodsResponseVo(), ShoppingCartConstant.SHOPPING_CART_GOODS_CHANGE);