Commit c77e3ecd by xiaoer.li@freemud.com

Merge remote-tracking branch 'remotes/origin/feature/套餐固定商品主食标识_1.9.19' into develop

parents 58aed566 e2392c5f
...@@ -1652,7 +1652,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1652,7 +1652,7 @@ public class OrderServiceImpl implements Orderservice {
comboProduct.setProductCode(products.get(comboSkuId).getProductCode()); comboProduct.setProductCode(products.get(comboSkuId).getProductCode());
comboProduct.setThirdProductSpecId(products.get(comboSkuId).getThirdProductSpecId()); comboProduct.setThirdProductSpecId(products.get(comboSkuId).getThirdProductSpecId());
comboProduct.setThirdProductPropertyId(getThirdPropertyId(products.get(comboSkuId).getProductAttributeGroupList(),comboProduct.getAddInfo())); comboProduct.setThirdProductPropertyId(getThirdPropertyId(products.get(comboSkuId).getProductAttributeGroupList(),comboProduct.getAddInfo()));
comboProduct.setStapleFood(products.get(comboSkuId).getStapleFood());
// todo 套餐商品的商品组信息 // todo 套餐商品的商品组信息
setProductGroupInfo(products.get(comboSkuId).getProductGroupList(), comboProduct); setProductGroupInfo(products.get(comboSkuId).getProductGroupList(), comboProduct);
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment