Commits · 470138cf8071b2e7dea9965432a6f14da36eb600 · order-group-application / order-group · GitLab

09 Aug, 2020 4 commits
- Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of… · 470138cf
```
Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	shopping-cart-application-service/pom.xml
#	shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/GoodsTypeEnum.java
```
  ping.wu committed Aug 09, 2020
  470138cf Browse Files
- 套餐优惠计算 · d99cc04a
  ping.wu committed Aug 09, 2020
  
  d99cc04a Browse Files
- Merge branch 'feature/1.9.32-加料商品开发' into develop · d5512886
  chongfu.liang committed Aug 09, 2020
  
  d5512886 Browse Files
- 区分行号 · b6b77dff
  chongfu.liang committed Aug 09, 2020
  
  b6b77dff Browse Files
08 Aug, 2020 16 commits
- 套餐优惠计算 · 834b8079
  ping.wu committed Aug 08, 2020
  
  834b8079 Browse Files
- fix · 26238c63
  huiyang.chen committed Aug 08, 2020
  
  26238c63 Browse Files
- Merge branch 'feature-2020/8/6-McCafe-会阳' into develop · 301d1158
  huiyang.chen committed Aug 08, 2020
  
  301d1158 Browse Files
- 封装更新取餐码入参 · e3cf0572
  huiyang.chen committed Aug 08, 2020
  
  e3cf0572 Browse Files
- 升级sdk · dd389239
  huiyang.chen committed Aug 08, 2020
  
  dd389239 Browse Files
- Merge branch 'feature-2020/8/6-McCafe-会阳' into develop · aa93903b
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/OrderApplication.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  huiyang.chen committed Aug 08, 2020
  aa93903b Browse Files
- macafe 更新取餐码 · 391633f5
  huiyang.chen committed Aug 08, 2020
  
  391633f5 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 60fab572
  徐康 committed Aug 08, 2020
  
  60fab572 Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into develop · c0a18e81
  徐康 committed Aug 08, 2020
  
  c0a18e81 Browse Files
- 创建订单使用真实openid · 4f2e0986
  徐康 committed Aug 08, 2020
  
  4f2e0986 Browse Files
- 升级sdk · db4dc6b9
  xiaoer.li@freemud.com committed Aug 08, 2020
  
  db4dc6b9 Browse Files
- 升级sdk · 9903b135
  xiaoer.li@freemud.com committed Aug 08, 2020
  
  9903b135 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into develop · 18662321
```
# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	shopping-cart-application-service/pom.xml
```
  xiaoer.li@freemud.com committed Aug 08, 2020
  18662321 Browse Files
- 支持按加料显示不同的行记录 · 6069a4fe
  xiaoer.li@freemud.com committed Aug 08, 2020
  
  6069a4fe Browse Files
- 加料原总价和现总价设0 · 119bfc12
  xiaoer.li@freemud.com committed Aug 08, 2020
  
  119bfc12 Browse Files
- macafe 订单查询 · 6983d0d5
  huiyang.chen committed Aug 08, 2020
  
  6983d0d5 Browse Files
07 Aug, 2020 20 commits
- Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of… · c710e3c9
```
Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Aug 07, 2020
  c710e3c9 Browse Files
- 购物车可用券接口 · 5b7daa2b
  ping.wu committed Aug 07, 2020
  
  5b7daa2b Browse Files
- 1 fix 合并冲突 · f8e762a0
  张洪旺 committed Aug 07, 2020
  
  f8e762a0 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 8a9c4b03
  徐康 committed Aug 07, 2020
  
  8a9c4b03 Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into develop · b5a3f887
  徐康 committed Aug 07, 2020
  
  b5a3f887 Browse Files
- 麦咖啡购物车url修改 · 7e05feb6
  徐康 committed Aug 07, 2020
  
  7e05feb6 Browse Files
- Merge branch '20200806-10000' of… · fb3599cd
```
Merge branch '20200806-10000' of gitlab.freemud.com:order-group-application/order-group into develop

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
#	order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
```
  张洪旺 committed Aug 07, 2020
  fb3599cd Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · e5ce4773
  徐康 committed Aug 07, 2020
  
  e5ce4773 Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into develop · 3e560423
  徐康 committed Aug 07, 2020
  
  3e560423 Browse Files
- 麦咖啡无库存 · 368d1694
  徐康 committed Aug 07, 2020
  
  368d1694 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 039fb6e3
  xiaoer.li@freemud.com committed Aug 07, 2020
  
  039fb6e3 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into develop · a77edd71
  xiaoer.li@freemud.com committed Aug 07, 2020
  
  a77edd71 Browse Files
- fixbug · 975979ca
  xiaoer.li@freemud.com committed Aug 07, 2020
  
  975979ca Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · cbf43f52
  徐康 committed Aug 07, 2020
  
  cbf43f52 Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into develop · f4d98146
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
```
  徐康 committed Aug 07, 2020
  f4d98146 Browse Files
- 创单校验和多个券冻结核销 · 38d42395
  徐康 committed Aug 07, 2020
  
  38d42395 Browse Files
- fixbug · 21ba2926
  xiaoer.li@freemud.com committed Aug 07, 2020
  
  21ba2926 Browse Files
- 1 预约单门店开关话术提示 · aa9cd379
  张洪旺 committed Aug 07, 2020
  
  aa9cd379 Browse Files
- Merge branch 'develop' of… · b4bc2021
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  vega committed Aug 07, 2020
  b4bc2021 Browse Files
- Merge branch 'feature/1.9.34-预支付失败记录消息到reason-肖家炜' into develop · 9d33f558
  vega committed Aug 07, 2020
  
  9d33f558 Browse Files