Merge branch 'feature/1.9.9_购物车校验' into develop

# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml

assortment-shoppingcart-sdk/pom.xml

@@ -42,7 +42,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>productcenter-sdk</artifactId>
-            <version>2.7.3-SNAPSHOT</version>
+            <version>2.7.4-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java

@@ -62,6 +62,7 @@ public class ShoppingCartAdapter {
             productType.setValidatePrice(productType.getPrice()==0?0:1);
             productType.setValidateAttribute(1);
             productType.setValidateStatuses(Arrays.asList(2));
+            productType.setUuid(cartGoods.getCartGoodsUid());
             //属性
             productType.setAttributeList(getAttributes(cartGoods.getExtra()));
             //可选搭配&固定搭配

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

@@ -187,7 +187,7 @@ public interface ShoppingCartBaseService {
             if (CollectionUtils.isNotEmpty(valiadResult.getFailureList())){
                 setToastMsgIfNotExist(checkCartRequest.getShoppingCartGoodsResponseVo(), ShoppingCartConstant.SHOPPING_CART_GOODS_CHANGE);
                 for (CartGoods cartGoods :checkCartRequest.getCartGoodsList()) {
-                    if (valiadResult.getFailureList().stream().anyMatch(f->cartGoods.getGoodsId().equals(f.getSkuId()))){
+                    if (valiadResult.getFailureList().stream().anyMatch(f->cartGoods.getCartGoodsUid().equals(f.getUuid()))){
                         cartGoods.setCartGoodsUid(null);
                         checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
                         checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_INVALIAD_GOODS);

shopping-cart-application-service/pom.xml

@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>productcenter-sdk</artifactId>
-            <version>2.7.3-SNAPSHOT</version>
+            <version>2.7.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>