Commit 5bad4a62 by 孙昱

sunyu::update::fix bug about multipleSpec add singleSpec product and material

parent e21da78e
...@@ -945,17 +945,19 @@ public class ShoppingCartConvertAdapter { ...@@ -945,17 +945,19 @@ public class ShoppingCartConvertAdapter {
if (CollectionUtils.isNotEmpty(spuProduct.getSkuList())) { if (CollectionUtils.isNotEmpty(spuProduct.getSkuList())) {
for (ProductTypeBeanDTO.SkuProductBean skuProductBean : spuProduct.getSkuList()) { for (ProductTypeBeanDTO.SkuProductBean skuProductBean : spuProduct.getSkuList()) {
if (CollectionUtils.isNotEmpty(skuProductBean.getAdditionalGroupList())) { 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<String> materialSpu = new ArrayList<>();
List<ProductTypeBeanDTO.ProductGroupType.GroupDetailType> groupDetail = new ArrayList<>(); List<ProductTypeBeanDTO.ProductGroupType.GroupDetailType> groupDetail = new ArrayList<>();
for (ProductTypeBeanDTO.ProductGroupType productGroupType : skuProductBean.getAdditionalGroupList()) {
groupDetail.addAll(productGroupType.getGroupDetail()); groupDetail.addAll(productGroupType.getGroupDetail());
}
HashMap<String, ProductTypeBeanDTO.ProductGroupType.GroupDetailType> materialHash = new HashMap<>(); HashMap<String, ProductTypeBeanDTO.ProductGroupType.GroupDetailType> materialHash = new HashMap<>();
for (ProductTypeBeanDTO.ProductGroupType.GroupDetailType groupDetailType : groupDetail) { for (ProductTypeBeanDTO.ProductGroupType.GroupDetailType groupDetailType : groupDetail) {
materialHash.put(groupDetailType.getProductId(), groupDetailType); materialHash.put(groupDetailType.getProductId(), groupDetailType);
materialSpu.add(groupDetailType.getProductId()); materialSpu.add(groupDetailType.getProductId());
} }
//加车小料和商品小料没有交集则提示商品信息有异常 //加车小料和商品小料没有交集则提示商品信息有异常
if (CollectionUtils.isEmpty(cartGoods.getProductMaterialList().stream().filter(e -> materialSpu.contains(e.getSpuId())).collect(Collectors.toList()))) { 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()); cartGoods.setGoodsType(com.freemud.sdk.api.assortment.shoppingcart.constant.GoodsTypeEnum.EXCEPTION_GOODS.getGoodsType());
...@@ -999,5 +1001,7 @@ public class ShoppingCartConvertAdapter { ...@@ -999,5 +1001,7 @@ public class ShoppingCartConvertAdapter {
} }
} }
} }
}
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment