Merge branches 'develop' and 'feature/20200926_麦咖啡特定属性与加料_wuping' of…

Merge branches 'develop' and 'feature/20200926_麦咖啡特定属性与加料_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/constant/ShoppingCartConstant.java

@@ -50,5 +50,12 @@ public class ShoppingCartConstant {
      */
     public static final int PRODUCT_DOWN= 104;
     public static final String CART_PRODUCT_INVALID_STATE = "您选择的【$spuName】商品已失效;";
+
+    /**
+     * 必选商品组无勾选商品
+     */
+    public static final int PRODUCT_GROUP_EMPTY= 109;
+    public static final String CART_PRODUCT_GROUP_EMPTY_STATE = "您选择的【$spuName】商品有未选商品";
+
 }
 

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

@@ -1276,6 +1276,7 @@ public class ShoppingCartMCoffeeServiceImpl {
             ValiadShopProductResponse validateResult = valiadResponse.getData();
             CartGoodsStates cartGoodsStates = new CartGoodsStates();
 
+            String toastMsg = "";
             //非法商品（商品是否存在、商品是否处于上架状态）自动移除，返回前端提示
             if (CollectionUtils.isNotEmpty(validateResult.getFailureList())){
                 List<String> invalidSpu = new ArrayList<>();
@@ -1304,11 +1305,16 @@ public class ShoppingCartMCoffeeServiceImpl {
                                 List<ProductBeanDTO> productList = validateResult.getFailureList().stream().map(ValiadShopProductResult::getProductType).collect(Collectors.toList());
                                 shoppingCartConvertAdapter.updateCartGoodsInfoForMCoffee(cartGoods, productList);
                             }
+                            if (PRODUCT_GROUP_EMPTY == validaProduct.getCode()) {
+                                cartGoodsStates.setHasInvalidGoods(true);
+                                cartGoods.setCartGoodsUid(null);
+                                toastMsg = toastMsg.concat(CART_PRODUCT_GROUP_EMPTY_STATE.replace("$spuName",StringUtils.join(Arrays.asList(spuName),",")));
+                                break;
+                            }
                         }
                     }
                 }
 
-                String toastMsg = "";
                 if (CollectionUtils.isNotEmpty(invalidSpu)){
                     toastMsg = toastMsg.concat(CART_PRODUCT_INVALID_STATE.replace("$spuName",StringUtils.join(invalidSpu,",")));
                 }