Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' into qa

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -945,17 +945,19 @@ public class ShoppingCartConvertAdapter {
         if (CollectionUtils.isNotEmpty(spuProduct.getSkuList())) {
             for (ProductTypeBeanDTO.SkuProductBean skuProductBean : spuProduct.getSkuList()) {
                 if (CollectionUtils.isNotEmpty(skuProductBean.getAdditionalGroupList())) {
+                    for (ProductTypeBeanDTO.ProductGroupType productGroupType : skuProductBean.getAdditionalGroupList()) {
+                        if (skuProductBean.getSkuId().equals(cartGoods.getGoodsId()) && null != productGroupType){
                             //提取加料信息
                             List<String> materialSpu = new ArrayList<>();
                             List<ProductTypeBeanDTO.ProductGroupType.GroupDetailType> groupDetail = new ArrayList<>();
-                    for (ProductTypeBeanDTO.ProductGroupType productGroupType : skuProductBean.getAdditionalGroupList()) {
                             groupDetail.addAll(productGroupType.getGroupDetail());
-                    }
+
                             HashMap<String, ProductTypeBeanDTO.ProductGroupType.GroupDetailType> materialHash = new HashMap<>();
                             for (ProductTypeBeanDTO.ProductGroupType.GroupDetailType groupDetailType : groupDetail) {
                                 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(com.freemud.sdk.api.assortment.shoppingcart.constant.GoodsTypeEnum.EXCEPTION_GOODS.getGoodsType());
@@ -999,5 +1001,7 @@ public class ShoppingCartConvertAdapter {
                     }
                 }
             }
+        }
+    }
 
 }
\ No newline at end of file