sunyu::update::fix bug

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

@@ -685,9 +685,7 @@ public class ShoppingCartConvertAdapter {
             productComboType = parentProductBean.getProductComboList().stream().filter(p -> ObjectUtils.equals(comboxGoods.getGoodsId(), p.getProductId())).findFirst().orElse(new ProductTypeBeanDTO.ProductComboType());
         } else {
             Map<String, ProductTypeBeanDTO.ProductGroupType.GroupDetailType> map = new HashMap<>();
-            if (CollectionUtils.isNotEmpty(parentProductBean.getAdditionalGroupList())){
             parentProductBean.getProductGroupList().stream().map(t -> t.getGroupDetail()).forEach(group -> group.forEach(detailType -> map.put(detailType.getProductId(), detailType)));
-            }
             groupDetailType = map.get(comboxGoods.getGoodsId());
         }
 
@@ -719,10 +717,14 @@ public class ShoppingCartConvertAdapter {
         comboxGoods.setTaxId(isComboxGoods ? (StringUtils.isNotEmpty(productComboType.getTaxId()) ? productComboType.getTaxId() : "") :
                 (StringUtils.isNotEmpty(groupDetailType.getTaxId()) ? groupDetailType.getTaxId() : ""));
 
-        //2020/12/10  套餐内可选商品加料
+        // TODO: 2020/10/22  套餐内可选商品加料，暂无
         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);
         }
+
     }
 
     private Map<String, String> getAttributesNew(List<com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.CartGoodsExtra> extra) {
@@ -909,6 +911,7 @@ 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);