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

46f580fa · 孙昱 · 44f0210c · 74942a86 · 46f580fa
Commit 46f580fa authored Dec 15, 2020 by 孙昱
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

No files found.
--- a/shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
+++ b/shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
@@ -980,8 +980,8 @@ public class ShoppingCartConvertAdapter {
                            }
                        }else {
                            for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.ComboxGoods productGroup : cartGoods.getProductGroupList()) {
-                                ProductTypeBeanDTO productBeanDTO = subProductTypeMap.get(productGroup.getSpuId());
+//                                ProductTypeBeanDTO productBeanDTO = subProductTypeMap.get(productGroup.getSpuId());
-                                updateComboxGoodsInfoForMCoffee(productGroup, productBeanDTO, false);
+                                updateComboxGoodsInfoForMCoffee(productGroup, spuProduct, false);
                            }
                        }
                    }