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

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

@@ -621,10 +621,10 @@ public class ShoppingCartConvertAdapter {
                     for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.ComboxGoods productCombo : cartGoods.getProductComboList()){
                         //套餐子商品多规格商品
                         if(productCombo.getSpuId() == null && !productCombo.getSkuId().equals(productCombo.getSpuId()) ){
-                            updateComboxGoodsInfoForMCoffee(productCombo, spuProduct, true,null);
+                            updateComboxGoodsInfoForMCoffee(productCombo, spuProduct, true);
                         }else {
                             //套餐子商品为单品
-                            updateComboxGoodsInfoForMCoffee(productCombo, spuProduct, true,null);
+                            updateComboxGoodsInfoForMCoffee(productCombo, spuProduct, true);
                         }
                     }
                 }
@@ -634,11 +634,11 @@ public class ShoppingCartConvertAdapter {
                         //套餐子商品多规格商品
                         if(comboxGoods.getSpuId() == null && !comboxGoods.getSkuId().equals(comboxGoods.getSpuId()) ){
                             for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.ComboxGoods productGroup : cartGoods.getProductGroupList()) {
-                                updateComboxGoodsInfoForMCoffee(productGroup, spuProduct, false,null);
+                                updateComboxGoodsInfoForMCoffee(productGroup, spuProduct, false);
                             }
                         }else {
                             for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.ComboxGoods productGroup : cartGoods.getProductGroupList()) {
-                                updateComboxGoodsInfoForMCoffee(productGroup, spuProduct, false,null);
+                                updateComboxGoodsInfoForMCoffee(productGroup, spuProduct, false);
                             }
                         }
                     }
@@ -685,7 +685,7 @@ public class ShoppingCartConvertAdapter {
      * @return
      */
     private void updateComboxGoodsInfoForMCoffee(com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.ComboxGoods comboxGoods,
-                                                 ProductTypeBeanDTO parentProductBean, boolean isComboxGoods,Map<String,ProductTypeBeanDTO> subProductTypeMap) {
+                                                 ProductTypeBeanDTO parentProductBean, boolean isComboxGoods) {
         if("0".equals(comboxGoods.getGoodsId())){
             return;
         }
@@ -731,7 +731,7 @@ public class ShoppingCartConvertAdapter {
 
         //2020/12/10  套餐内可选商品加料
         if(CollectionUtils.isNotEmpty(comboxGoods.getProductMaterialList())){
-            resolveMaterialForProductGroup(comboxGoods,subProductTypeMap);
+
         }
     }
 
@@ -921,7 +921,7 @@ public class ShoppingCartConvertAdapter {
                             updateComboxGoodsInfoFor(productCombo, productBeanDTO, true);
                         }else {
                             //套餐子商品为单品
-                            updateComboxGoodsInfoForMCoffee(productCombo, spuProduct, true,null);
+                            updateComboxGoodsInfoForMCoffee(productCombo, spuProduct, true);
                         }
                     }
                 }
@@ -931,11 +931,12 @@ public class ShoppingCartConvertAdapter {
                         //套餐子商品多规格商品
                         if(comboxGoods.getSpuId() != null && !comboxGoods.getSkuId().equals(comboxGoods.getSpuId()) ){
                             for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.ComboxGoods productGroup : cartGoods.getProductGroupList()) {
-                                updateComboxGoodsInfoForMCoffee(productGroup, spuProduct, false,subProductTypeMap);
+                                ProductTypeBeanDTO productBeanDTO = subProductTypeMap.get(comboxGoods.getSpuId());
+                                updateComboxGoodsInfoForMCoffee(productGroup, productBeanDTO, false);
                             }
                         }else {
                             for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.ComboxGoods productGroup : cartGoods.getProductGroupList()) {
-                                updateComboxGoodsInfoForMCoffee(productGroup, spuProduct, false,subProductTypeMap);
+                                updateComboxGoodsInfoForMCoffee(productGroup, spuProduct, false);
                             }
                         }
                     }