Merge branch 'feature/20210319-多规格加料组问题-lcf'

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

@@ -371,20 +371,49 @@ public class ShoppingCartAdapter {
     private void checkMaterialProduct(CartGoods cartGoods, ProductBeanDTO spuProduct) {
 
         if (CollectionUtils.isEmpty(cartGoods.getProductMaterialList())) return;
+        ProductBeanDTO.SkuProductBean skuProductBean = null;
+        boolean isSkuProduct = ObjectUtils.equals(GoodsTypeEnum.SKU_GOODS.getGoodsType(), cartGoods.getGoodsType());
+        if (isSkuProduct){
+            if (CollectionUtils.isEmpty(spuProduct.getSkuList())){
+                cartGoods.setGoodsType(GoodsTypeEnum.EXCEPTION_GOODS.getGoodsType());
+                cartGoods.setProductMaterialList(new ArrayList<>());
+                return;
+            } else {
+                skuProductBean = spuProduct.getSkuList().stream().filter(p -> p.getSkuId().equals(cartGoods.getSkuId())).findFirst().orElse(null);
+                if (skuProductBean == null || CollectionUtils.isEmpty(skuProductBean.getAdditionalGroupList())){
+                    cartGoods.setGoodsType(GoodsTypeEnum.EXCEPTION_GOODS.getGoodsType());
+                    cartGoods.setProductMaterialList(new ArrayList<>());
+                    return;
+                }
+            }
+        } else {
             //加料信息为空
             if (CollectionUtils.isEmpty(spuProduct.getAdditionalGroupList())) {
                 cartGoods.setGoodsType(GoodsTypeEnum.EXCEPTION_GOODS.getGoodsType());
                 cartGoods.setProductMaterialList(new ArrayList<>());
                 return;
             }
+        }
         //提取加料信息
         List<String> materialSpu = new ArrayList<>();
-        List<ProductBeanDTO.ProductGroupType.GroupDetailType> groupDetail = spuProduct.getAdditionalGroupList().get(0).getGroupDetail();
         HashMap<String, ProductBeanDTO.ProductGroupType.GroupDetailType> materialHash = new HashMap<>();
-        for (ProductBeanDTO.ProductGroupType.GroupDetailType groupDetailType : groupDetail) {
+        if (isSkuProduct){
+            List<ProductBeanDTO.ProductGroupType> groupList = skuProductBean.getAdditionalGroupList();
+            for (ProductBeanDTO.ProductGroupType groupDetail : groupList) {
+                for (ProductBeanDTO.ProductGroupType.GroupDetailType groupDetailType : groupDetail.getGroupDetail()) {
                     materialHash.put(groupDetailType.getProductId(), groupDetailType);
                     materialSpu.add(groupDetailType.getProductId());
                 }
+            }
+        } else {
+            List<ProductBeanDTO.ProductGroupType> groupList = spuProduct.getAdditionalGroupList();
+            for (ProductBeanDTO.ProductGroupType groupDetail : groupList){
+                for (ProductBeanDTO.ProductGroupType.GroupDetailType groupDetailType : groupDetail.getGroupDetail()) {
+                    materialHash.put(groupDetailType.getProductId(), groupDetailType);
+                    materialSpu.add(groupDetailType.getProductId());
+                }
+            }
+        }
         //加车小料和商品小料没有交集则提示商品信息有异常
         if(CollectionUtils.isEmpty(cartGoods.getProductMaterialList().stream().filter(e->materialSpu.contains(e.getSpuId())).collect(Collectors.toList()))) {
             cartGoods.setGoodsType(GoodsTypeEnum.EXCEPTION_GOODS.getGoodsType());