sunyu::update::fix bug about checkShoppingCartINfo

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

@@ -211,13 +211,18 @@ public interface ShoppingCartBaseService {
             }
             ValiadShopProductResponse validateResult = valiadResponse.getData();
             CartGoodsStates cartGoodsStates = new CartGoodsStates();
+
+            Map<String,String> productInfoMap = new HashMap<>();
+            for (CartGoods cartGoods : checkCartRequest.getCartGoodsList()) {
+                productInfoMap.put(cartGoods.getSkuId(),cartGoods.getSkuName());
+            }
             //非法商品（商品是否存在、商品是否处于上架状态）自动移除，返回前端提示
             if (CollectionUtils.isNotEmpty(validateResult.getFailureList())){
                 for (int i = 0; i < validateResult.getFailureList().size(); i++) {
                     checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
                     ValiadShopProductResult validaProduct = validateResult.getFailureList().get(i);
                     for (CartGoods cartGoods : checkCartRequest.getCartGoodsList()) {
-                        String spuName = cartGoods.getSkuId().equals(validaProduct.getSkuId()) ? cartGoods.getSpuName() : "";
+                        String spuName = !productInfoMap.isEmpty() ? productInfoMap.get(cartGoods.getSkuId()) : "";
                         if (PRODUCT_DOWN == validaProduct.getCode()){
                             cartGoodsStates.setHasInvalidGoods(true);
                             cartGoods.setCartGoodsUid(null);
@@ -239,20 +244,21 @@ public interface ShoppingCartBaseService {
                         cartGoodsStates.setPriceChanged(true);
                         checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
                         ValiadShopProductResult validaProduct = validateResult.getFailureList().get(i);
-                        String spuName =  "";
+                        List<String> spuNameList =  new ArrayList<>();
                         for (CartGoods cartGoods : checkCartRequest.getCartGoodsList()) {
                             if (PRODUCT_PRICE_CHANGE == validaProduct.getCode()) {
-                                spuName = spuName.concat(cartGoods.getSkuId().equals(validaProduct.getSkuId()) ? cartGoods.getSpuName() : "").concat(",");
+                                spuNameList.add(cartGoods.getSkuId().equals(validaProduct.getSkuId()) ? cartGoods.getSpuName() : "");
                                 List<ProductBeanDTO> productList = validateResult.getFailureList().stream().map(ValiadShopProductResult::getProductType).collect(Collectors.toList());
                                 shoppingCartAdapter.updateCartGoodsInfoNew(cartGoods, productList);
                             }
                         }
-                        if (spuName.split(",").length > 1){
-                            spuName.substring(0,spuName.length()-1).concat("等");
+                        if (spuNameList.size() > 2){
+                            spuNameList.remove(spuNameList.size()-1);
                         }
                         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("】",""));
+                        if (CollectionUtils.isNotEmpty(spuNameList)){
+                            String spuName = spuNameList.size()>1 ? StringUtils.join(spuNameList,",").concat("等") : StringUtils.join(spuNameList,",") ;
+                            checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(toastMsg.concat(CART_PRODUCT_PRICE_CHANGE.replace("$spuName", spuName)));
                         }
                     }
                 }