sunyu::update::fix bug about productGroup add material

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

@@ -809,6 +809,79 @@ public class ShoppingCartConvertAdapter {
         cartGoods.setOriginalMaterialAmount(originalMaterAmount);
     }
 
+    /**
+     * 可选商品组加料处理逻辑
+     * @param cartGoods
+     * @param spuProduct
+     * @param subProductTypeMap
+     */
+    private void resolveMaterialForProductGroup(com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods cartGoods, ProductTypeBeanDTO spuProduct,Map<String,ProductTypeBeanDTO> subProductTypeMap){
+        //可选商品加料信息提取
+        List<com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods> groupProductMaterial = new ArrayList<>();
+        for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.ComboxGoods comboxGoods : cartGoods.getProductGroupList()) {
+            groupProductMaterial.addAll(comboxGoods.getProductMaterialList());
+        }
+
+        if (null != subProductTypeMap && !subProductTypeMap.isEmpty()) {
+            ProductTypeBeanDTO productTypeBeanDTO = subProductTypeMap.get(cartGoods);
+            if (CollectionUtils.isNotEmpty(productTypeBeanDTO.getAdditionalGroupList())){
+                List<String> materialSpu = new ArrayList<>();
+                HashMap<String, ProductTypeBeanDTO.ProductGroupType.GroupDetailType> materialHash = new HashMap<>();
+                for (ProductTypeBeanDTO.ProductGroupType productGroupType : productTypeBeanDTO.getAdditionalGroupList()) {
+                    //提取加料信息
+                    List<ProductTypeBeanDTO.ProductGroupType.GroupDetailType> groupDetail = new ArrayList<>();
+                    groupDetail.addAll(productGroupType.getGroupDetail());
+
+                    for (ProductTypeBeanDTO.ProductGroupType.GroupDetailType groupDetailType : groupDetail) {
+                        materialHash.put(groupDetailType.getProductId(), groupDetailType);
+                        materialSpu.add(groupDetailType.getProductId());
+                    }
+                }
+
+                //加车小料和商品小料没有交集则提示商品信息有异常
+                if (CollectionUtils.isEmpty(groupProductMaterial.stream().filter(e -> materialSpu.contains(e.getSpuId())).collect(Collectors.toList()))) {
+                    cartGoods.setGoodsType(com.freemud.sdk.api.assortment.shoppingcart.constant.GoodsTypeEnum.EXCEPTION_GOODS.getGoodsType());
+                    cartGoods.setProductMaterialList(new ArrayList<>());
+                    return;
+                }
+                ArrayList<com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods> materialGoodsList = new ArrayList<>();
+                Long materialAmount = 0L;
+                Long originalMaterAmount = 0L;
+                String materialSubName = cartGoods.getSubName();
+                for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods materialGoods : cartGoods.getProductMaterialList()) {
+                    ProductTypeBeanDTO.ProductGroupType.GroupDetailType detail = materialHash.get(materialGoods.getSpuId());
+                    if (detail == null) continue;
+                    com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods material = new com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods();
+                    material.setSpuName(detail.getProductName());
+                    material.setSpuId(detail.getProductId());
+                    //行单价 \ 行总价
+                    material.setFinalPrice(detail.getProductFinalPrice().longValue());
+                    material.setAmount(detail.getProductFinalPrice().longValue() * cartGoods.getQty());
+                    //原行单价*数量
+                    material.setOriginalAmount(detail.getProductFinalPrice().longValue() * cartGoods.getQty());
+                    material.setOriginalPrice(detail.getProductFinalPrice().longValue());
+                    material.setCustomerCode(materialGoods.getCustomerCode());
+                    materialGoodsList.add(material);
+                    materialAmount += detail.getProductFinalPrice().longValue() * cartGoods.getQty();
+                    originalMaterAmount += detail.getProductFinalPrice().longValue() * cartGoods.getQty();
+                    ;
+                    materialSubName = materialSubName + "/" + detail.getProductName();
+                }
+                //设置购物车行记录
+                cartGoods.setProductMaterialList(materialGoodsList);
+                //加料行记录现价总价
+                cartGoods.setMaterialAmount(materialAmount);
+                //加料行记录原价总价
+                cartGoods.setOriginalMaterialAmount(originalMaterAmount);
+
+            }else{
+                cartGoods.setGoodsType(com.freemud.sdk.api.assortment.shoppingcart.constant.GoodsTypeEnum.EXCEPTION_GOODS.getGoodsType());
+                cartGoods.setProductMaterialList(new ArrayList<>());
+                return;
+            }
+        }
+    }
+
 
     public void updateCartGoodsInfo(com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods cartGoods, ProductTypeBeanDTO spuProduct,Map<String,ProductTypeBeanDTO> subProductTypeMap) {
         try {