Merge branch 'feature/20201210_可选商品加料需求_yu.sun' into qa

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

@@ -734,12 +734,48 @@ public class ShoppingCartConvertAdapter {
         comboxGoods.setTaxId(isComboxGoods ? (StringUtils.isNotEmpty(productComboType.getTaxId()) ? productComboType.getTaxId() : "") :
                 (StringUtils.isNotEmpty(groupDetailType.getTaxId()) ? groupDetailType.getTaxId() : ""));
 
-        // TODO: 2020/10/22  套餐内可选商品加料，暂无
+        //2020/12/15  套餐内可选商品加料，暂无
         if(CollectionUtils.isNotEmpty(comboxGoods.getProductMaterialList())){
-            List<com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods> productMaterialList = new ArrayList<>();
-            com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods materialGoods = new com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods();
-            productMaterialList.add(materialGoods);
-            comboxGoods.setProductMaterialList(productMaterialList);
+            if (CollectionUtils.isNotEmpty(parentProductBean.getAdditionalGroupList())) {
+                List<ProductTypeBeanDTO.ProductGroupType.GroupDetailType> groupDetail = new ArrayList<>();
+                for (ProductTypeBeanDTO.ProductGroupType productGroupType : parentProductBean.getAdditionalGroupList()){
+                    groupDetail.addAll(productGroupType.getGroupDetail());
+                }
+                for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods productMaterial :comboxGoods.getProductMaterialList()){
+                    for (ProductTypeBeanDTO.ProductGroupType.GroupDetailType productGroupType : groupDetail){
+                        if(productGroupType.getProductId().equals(productMaterial.getSpuId())){
+                            productMaterial.setSpuId(productGroupType.getProductId());
+                            productMaterial.setAmount(productGroupType.getProductFinalPrice().longValue());
+                            productMaterial.setFinalPrice(productGroupType.getProductFinalPrice().longValue());
+                            productMaterial.setOriginalAmount(productGroupType.getProductFinalPrice().longValue());
+                            productMaterial.setOriginalPrice(productGroupType.getProductFinalPrice().longValue());
+                            productMaterial.setSpuName(productGroupType.getProductName());
+                        }
+                    }
+                }
+            }else {
+                if(CollectionUtils.isNotEmpty(parentProductBean.getAdditionalGroupList())){
+                    List<ProductTypeBeanDTO.ProductGroupType.GroupDetailType> groupDetail = new ArrayList<>();
+                    for (ProductTypeBeanDTO.ProductGroupType productGroupType : parentProductBean.getAdditionalGroupList()){
+                        groupDetail.addAll(productGroupType.getGroupDetail());
+                    }
+                    for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods productMaterial :comboxGoods.getProductMaterialList()){
+                        for (ProductTypeBeanDTO.ProductGroupType.GroupDetailType productGroupType : groupDetail){
+                            if(productGroupType.getProductId().equals(productMaterial.getSpuId())){
+                                productMaterial.setSpuId(productGroupType.getProductId());
+                                productMaterial.setAmount(productGroupType.getProductFinalPrice().longValue());
+                                productMaterial.setFinalPrice(productGroupType.getProductFinalPrice().longValue());
+                                productMaterial.setOriginalAmount(productGroupType.getProductFinalPrice().longValue());
+                                productMaterial.setOriginalPrice(productGroupType.getProductFinalPrice().longValue());
+                                productMaterial.setSpuName(productGroupType.getProductName());
+                            }
+                        }
+                    }
+                }else {
+                    //都不存在移除商品
+                    comboxGoods.setProductMaterialList(new ArrayList<>());
+                }
+            }
         }
 
     }
@@ -928,7 +964,6 @@ public class ShoppingCartConvertAdapter {
                         if(productCombo.getSpuId() != null && !productCombo.getSkuId().equals(productCombo.getSpuId()) ){
                             ProductTypeBeanDTO productBeanDTO = subProductTypeMap.get(productCombo.getSpuId());
                             updateComboxGoodsInfoFor(productCombo, productBeanDTO, true);
-
                         }else {
                             //套餐子商品为单品
                             updateComboxGoodsInfoForMCoffee(productCombo, spuProduct, true);
@@ -945,7 +980,8 @@ public class ShoppingCartConvertAdapter {
                             }
                         }else {
                             for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.ComboxGoods productGroup : cartGoods.getProductGroupList()) {
-                                updateComboxGoodsInfoForMCoffee(productGroup, spuProduct, false);
+                                ProductTypeBeanDTO productBeanDTO = subProductTypeMap.get(productGroup.getSpuId());
+                                updateComboxGoodsInfoForMCoffee(productGroup, productBeanDTO, false);
                             }
                         }
                     }