Commits · 5abcc4bfb6193e4cee8a3852db808e8266d459d0 · order-group-application / order-group

29 Oct, 2020 12 commits
- Merge branch 'feature/20201021_万能券展示问题_xukang' into 2020/10/29-fabu-huiyang · 5abcc4bf
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
```
  徐康 committed Oct 29, 2020
  5abcc4bf Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into 2020/10/29-fabu-huiyang · 7fe04924
  徐康 committed Oct 29, 2020
  
  7fe04924 Browse Files
- 特制属性 · 9d26c074
  徐康 committed Oct 29, 2020
  
  9d26c074 Browse Files
- 加料商品顺序 · ea0a418d
  徐康 committed Oct 29, 2020
  
  ea0a418d Browse Files
- 加料价格 · c3ab1e95
  徐康 committed Oct 29, 2020
  
  c3ab1e95 Browse Files
- fix 随单购合并代码 · fd013ec1
  huiyang.chen committed Oct 29, 2020
  
  fd013ec1 Browse Files
- Merge branch '2020/10/06-随单购买月享卡-huiyang' into 2020/10/29-fabu-huiyang · 413cce8c
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OldOrderAccountType.java
#	order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java
#	order-application-service/src/main/java/cn/freemud/service/mccafe/impl/CouponClientServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/activity/ActivityDiscountsDto.java
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java
```
  huiyang.chen committed Oct 29, 2020
  413cce8c Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' · 19c4360e
  xiaoer.li@freemud.com committed Oct 29, 2020
  
  19c4360e Browse Files
- 行记录：套餐用促销的价格+可选搭配 · e7e077fb
  xiaoer.li@freemud.com committed Oct 29, 2020
  
  e7e077fb Browse Files
- 餐道价格显示 · 43cc310f
  徐康 committed Oct 29, 2020
  
  43cc310f Browse Files
- 餐道价格显示 · c4719198
  徐康 committed Oct 29, 2020
  
  c4719198 Browse Files
- 麦咖啡随单购卡优惠 1 · c3d2bb92
  huiyang.chen committed Oct 29, 2020
  
  c3d2bb92 Browse Files
28 Oct, 2020 14 commits
- 啡常月享卡 · 125b619c
  徐康 committed Oct 28, 2020
  
  125b619c Browse Files
- 啡常月享卡 · 4d439421
  徐康 committed Oct 28, 2020
  
  4d439421 Browse Files
- 促销计算：集点活动 · 04517055
  xiaoer.li@freemud.com committed Oct 28, 2020
  
  04517055 Browse Files
- 合并新的算价 · 8a186322
  xiaoer.li@freemud.com committed Oct 28, 2020
  
  8a186322 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' · b6d5a887
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/SetMealServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  xiaoer.li@freemud.com committed Oct 28, 2020
  b6d5a887 Browse Files
- 升级sdk · f2328bea
  chongfu.liang committed Oct 28, 2020
  
  f2328bea Browse Files
- Merge branch 'feature/2.0.4-集点改造' · 5185742c
  chongfu.liang committed Oct 28, 2020
  
  5185742c Browse Files
- 改造 · a04b1a79
  chongfu.liang committed Oct 28, 2020
  
  a04b1a79 Browse Files
- Merge branch 'feature/2.0.4-集点改造' · e589cd4a
  chongfu.liang committed Oct 28, 2020
  
  e589cd4a Browse Files
- 改造 · 17f2c468
  chongfu.liang committed Oct 28, 2020
  
  17f2c468 Browse Files
- 升级SDK · ba4383de
  chongfu.liang committed Oct 28, 2020
  
  ba4383de Browse Files
- 放时间戳 · 61f4a9de
  chongfu.liang committed Oct 28, 2020
  
  61f4a9de Browse Files
- 保存随单购券的键位 · 5f03c0df
  徐康 committed Oct 28, 2020
  
  5f03c0df Browse Files
- 创建订单时落库 · faac5644
  chongfu.liang committed Oct 28, 2020
  
  faac5644 Browse Files
27 Oct, 2020 14 commits
- 日志 · a7f62381
  chongfu.liang committed Oct 28, 2020
  
  a7f62381 Browse Files
- 参数改造 · 7da3c3a1
  chongfu.liang committed Oct 28, 2020
  
  7da3c3a1 Browse Files
- 参数改造 · 8725bded
  chongfu.liang committed Oct 28, 2020
  
  8725bded Browse Files
- 参数改造 · dc423b2e
  chongfu.liang committed Oct 28, 2020
  
  dc423b2e Browse Files
- 参数改造 · 95d78360
  chongfu.liang committed Oct 27, 2020
  
  95d78360 Browse Files
- 修改参数 · 8d74cce6
  chongfu.liang committed Oct 27, 2020
  
  8d74cce6 Browse Files
- 修改参数 · 3f6140e1
  chongfu.liang committed Oct 27, 2020
  
  3f6140e1 Browse Files
- 修改参数 · 819f1816
  chongfu.liang committed Oct 27, 2020
  
  819f1816 Browse Files
- 升级SDK · 24343252
  chongfu.liang committed Oct 27, 2020
  
  24343252 Browse Files
- 随单买月卡 · 0402e85c
  徐康 committed Oct 27, 2020
  
  0402e85c Browse Files
- 麦咖啡查询订单 · 16dfad36
  徐康 committed Oct 27, 2020
  
  16dfad36 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2020-1026-删除已过期的券' · 9669c56f
  xiaoer.li@freemud.com committed Oct 27, 2020
  
  9669c56f Browse Files
- fix 随单购商品折扣 · acad4fab
  huiyang.chen committed Oct 27, 2020
  
  acad4fab Browse Files
- Merge branch 'feature/2.0.3-sdk-common-base升级' · 27b66f70
  chongfu.liang committed Oct 27, 2020
  
  27b66f70 Browse Files