Merge branch 'master' into pre

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ProductServiceImpl.java

@@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
@@ -86,16 +87,31 @@ public class ProductServiceImpl implements ProductService {
                 return CartResponseUtil.error(valiadResponse.getErrmsg(),checkCartRequest);
             }
             ValiadShopProductResponse valiadResult = valiadResponse.getData();
+            if (CollectionUtils.isEmpty(valiadResult.getSuccessList())) {
+                checkCartRequest.getCartGoodsList().clear();
+                checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
+                checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_INVALIAD_GOODS);
+                return CartResponseUtil.success(checkCartRequest);
+            }
+            Map<String, ValiadShopProductResult> successMap = valiadResult.getSuccessList().stream().collect(Collectors.toMap(ValiadShopProductResult::getUuid, Function.identity(), (k1, k2) -> k1));
             //非法商品（商品是否存在、商品是否处于上架状态）自动移除，返回前端提示
-            if (CollectionUtils.isNotEmpty(valiadResult.getFailureList())){
-                setToastMsgIfNotExist(checkCartRequest.getShoppingCartGoodsResponseVo(), ShoppingCartConstant.SHOPPING_CART_GOODS_CHANGE);
+            boolean hasChange = false;
             for (CartGoods cartGoods :checkCartRequest.getCartGoodsList()) {
-                    if (valiadResult.getFailureList().stream().anyMatch(f->cartGoods.getCartGoodsUid().equals(f.getUuid()))){
+                // 当goodsId为空或商品是商品券时直接跳过
+                if (StringUtils.isEmpty(cartGoods.getGoodsId()) || Objects.equals(cartGoods.getGoodsType(), GoodsTypeEnum.COUPON_GOODS.getGoodsType())
+                        || Objects.equals(cartGoods.getGoodsType(), GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType())
+                        || Objects.equals(cartGoods.getGoodsType(), GoodsTypeEnum.BUY_M_SEND_N_COUPON.getGoodsType())) {
+                    continue;
+                }
+                if (!successMap.containsKey(cartGoods.getCartGoodsUid())){
+                    hasChange = true;
                     cartGoods.setCartGoodsUid(null);
                     checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
                     checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_INVALIAD_GOODS);
                 }
             }
+            if (hasChange){
+                setToastMsgIfNotExist(checkCartRequest.getShoppingCartGoodsResponseVo(), ShoppingCartConstant.SHOPPING_CART_GOODS_CHANGE);
                 checkCartRequest.getCartGoodsList().removeIf(k ->  StringUtils.isEmpty(k.getCartGoodsUid()));
             }
             // Todo : 验证的商品信息