Skip to content

O
order-group
Commit 85a6fcf2 by 徐康
Options

Merge branch 'feature/20201124_xukang_麦咖啡p3v3' into qa

parents 1d18cbe7 f39d88f9
Showing with 1 additions and 1 deletions
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
...@@ -2367,7 +2367,7 @@ public class OrderAdapter { ...@@ -2367,7 +2367,7 @@ public class OrderAdapter {
if(cartGoodsDetailDto.getProductType() != null) { if(cartGoodsDetailDto.getProductType() != null) {
if(cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT.getCode() if(cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT.getCode()
|| cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT_UPPRICE.getCode()) { || cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT_UPPRICE.getCode()) {
createOrderProductDemoDto.setPrice(0l); // createOrderProductDemoDto.setPrice(0l);
//套餐 //套餐
List<CreateOrderProductRequest> comboProducts = new ArrayList<>(); List<CreateOrderProductRequest> comboProducts = new ArrayList<>();
cartGoodsDetailDto.getComboProducts().forEach(product -> { cartGoodsDetailDto.getComboProducts().forEach(product -> {
......
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