修复结算页商品列表为空时，才提示

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

@@ -162,8 +162,14 @@ public class ShoppingCartAdapter {
         cartGoods.setSkuName(productBean.getName());
         cartGoods.setSpecProductId(attributes.get(ATTRIBUTEID));
 
-
+        String skuSpecName = "";
+        if (CollectionUtils.isNotEmpty(productBean.getSkuSpecValues())) {
+            List<String> skuSpecValus = productBean.getSkuSpecValues().stream().map(p -> p.getSpecValue()).collect(Collectors.toList());
+            skuSpecName = StringUtils.join(skuSpecValus, "/");
+        }
         String attributeName = attributes.get(ATTRIBUTENAME) == null ? "" : attributes.get(ATTRIBUTENAME);
+        cartGoods.setSubName(StringUtils.isNotEmpty(skuSpecName) && StringUtils.isNotEmpty(attributeName) ?
+                skuSpecName + "/" + attributeName : skuSpecName + attributeName);
         cartGoods.setPic(StringUtils.isBlank(productBean.getPicture()) ? spuProduct.getPicture() : productBean.getPicture());
         cartGoods.setPackPrice(productBean.getPackPrice());
         cartGoods.setStockLimit(ObjectUtils.equals(1, productBean.getStockLimit()));
@@ -265,6 +271,15 @@ public class ShoppingCartAdapter {
         cartGoods.setStockLimit(isSkuProduct? ObjectUtils.equals(1, skuProduct.getStockLimit()):ObjectUtils.equals(1, spuProduct.getStockLimit()));
         cartGoods.setCustomerCode(isSkuProduct?skuProduct.getCustomerCode(): spuProduct.getCustomerCode());
 
+        String skuSpecName = "";
+        if (isSkuProduct && CollectionUtils.isNotEmpty(skuProduct.getSkuSpecValues())) {
+            List<String> skuSpecValus = skuProduct.getSkuSpecValues().stream().map(p -> p.getSpecValue()).collect(Collectors.toList());
+            skuSpecName = StringUtils.join(skuSpecValus, "/");
+        }
+        String attributeName = attributes.get(ATTRIBUTENAME) == null ? "" : attributes.get(ATTRIBUTENAME);
+        cartGoods.setSubName(StringUtils.isNotEmpty(skuSpecName) && StringUtils.isNotEmpty(attributeName) ?
+                skuSpecName + "/" + attributeName : skuSpecName + attributeName);
+
         if (isSetMealProduct) {
             if (CollectionUtils.isNotEmpty(cartGoods.getProductComboList())) {
                 for (CartGoods.ComboxGoods productCombo : cartGoods.getProductComboList()) {

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.2-SNAPSHOT</version>
+            <version>2.7.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -326,6 +326,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         // check购物车中所有商品
         CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, partnerId, storeId, shoppingCartGoodsResponseVo, updateShoppingCartGoodsQtyRequestVo.getOrderType(), "", shoppingCartBaseService);
         if (checkCartRequest.getShoppingCartGoodsResponseVo() != null) {
+            shoppingCartGoodsResponseVo.setChanged(checkCartRequest.getShoppingCartGoodsResponseVo().getChanged());
             shoppingCartGoodsResponseVo.setToastMsg(checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg());
         }
         cartGoodsList = JSONArray.parseArray(JSONObject.toJSONString(checkCartRequest.getCartGoodsList()), CartGoods.class);
@@ -1130,6 +1131,12 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         if (StringUtils.isNotEmpty(toastMsg)) {
             toastMsg=shoppingCartInfoRequestVo!=null && ObjectUtils.equals(1, shoppingCartInfoRequestVo.getFlag())?SHOPPING_CART_EMPTY_GOODS_LIST:SHOPPING_CART_INVALIAD_GOODS;
             setToastMsgIfNotExist(shoppingCartGoodsResponseVo, toastMsg);
+            //结算页，只有商品全部非法（即products为空）时，才提示changed为true toastMsg 不为空
+            if (shoppingCartInfoRequestVo!=null && ObjectUtils.equals(1, shoppingCartInfoRequestVo.getFlag())){
+                shoppingCartGoodsResponseVo.setChanged(CollectionUtils.isEmpty(cartGoodsList));
+                shoppingCartGoodsResponseVo.setToastMsg(CollectionUtils.isEmpty(cartGoodsList)?toastMsg:"");
+            }
+
         }
         // 给前端展示
         shoppingCartGoodsResponseVo.setNewPackAmount(shoppingCartGoodsResponseVo.getPackAmount());