Commits · db1ea9fc971a5ec60f4890d24511ad4e559c09c4 · order-group-application / order-group · GitLab

12 Aug, 2020 14 commits
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · db1ea9fc
  xiaoer.li@freemud.com committed Aug 12, 2020
  
  db1ea9fc Browse Files
- 增加加料商品变化校验 · 07ed3de5
  xiaoer.li@freemud.com committed Aug 12, 2020
  
  07ed3de5 Browse Files
- Merge branch 'feature/2020/08/12.1.9.33-停车场添加bizTypes属性-张志恒' into qa · 15a2f25c
  zhiheng.zhang committed Aug 12, 2020
  
  15a2f25c Browse Files
- 停车场添加业务类型bizTypes · 490098f8
  zhiheng.zhang committed Aug 12, 2020
  
  490098f8 Browse Files
- 停车场添加业务类型bizTypes · 86fa8b8e
  zhiheng.zhang committed Aug 12, 2020
  
  86fa8b8e Browse Files
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into qa · 8f8f7aa8
  zhiheng.zhang committed Aug 12, 2020
  
  8f8f7aa8 Browse Files
- 订单服务配合券码添加商户号 · 92a8c2e2
  zhiheng.zhang committed Aug 12, 2020
  
  92a8c2e2 Browse Files
- 券码jar包版本升级 · db906365
  zhiheng.zhang committed Aug 12, 2020
  
  db906365 Browse Files
- Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · 474abafa
  zhiheng.zhang committed Aug 12, 2020
  
  474abafa Browse Files
- 合并券码代码 · 0ff85a36
  zhiheng.zhang committed Aug 12, 2020
  
  0ff85a36 Browse Files
- Merge branch 'feature/1.9.32-加料商品开发' into qa · 44e0ffe5
  chongfu.liang committed Aug 12, 2020
  
  44e0ffe5 Browse Files
- C端加料价格计算 · 979cd8c8
  chongfu.liang committed Aug 12, 2020
  
  979cd8c8 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 030dfc62
  zhiheng.zhang committed Aug 12, 2020
  
  030dfc62 Browse Files
- 围餐直接核销 · 061118c3
  zhiheng.zhang committed Aug 12, 2020
  
  061118c3 Browse Files
11 Aug, 2020 3 commits
- 券服务版本升级 · a172fe8b
  zhiheng.zhang committed Aug 11, 2020
  
  a172fe8b Browse Files
- 券服务版本升级 · 19186e32
  zhiheng.zhang committed Aug 11, 2020
  
  19186e32 Browse Files
- 优惠券锁定与解锁 · 69a0d96b
  zhiheng.zhang committed Aug 11, 2020
  
  69a0d96b Browse Files
10 Aug, 2020 5 commits
- Merge branch 'feature-2020/8/3-1.9.33-会阳' · 7560abe2
  huiyang.chen committed Aug 10, 2020
  
  7560abe2 Browse Files
- 升级sdk 去掉加料累计 · b1f43654
  xiaoer.li@freemud.com committed Aug 10, 2020
  
  b1f43654 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · c6bcdf9c
  xiaoer.li@freemud.com committed Aug 10, 2020
  
  c6bcdf9c Browse Files
- 小料价格和成交价分开显示 · f13fc5fb
  xiaoer.li@freemud.com committed Aug 10, 2020
  
  f13fc5fb Browse Files
- Merge branch 'feature/1.9.34-订单调开卡接口传门店id给会员-肖家炜' into qa · f8ffc9c4
  vega committed Aug 10, 2020
  
  f8ffc9c4 Browse Files
09 Aug, 2020 5 commits
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 3846b179
```
# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	shopping-cart-application-service/pom.xml
```
  xiaoer.li committed Aug 09, 2020
  3846b179 Browse Files
- fix · d05abeb9
  xiaoer.li committed Aug 09, 2020
  
  d05abeb9 Browse Files
- 加料均摊 · f852f9a9
  xiaoer.li committed Aug 09, 2020
  
  f852f9a9 Browse Files
- Merge branch 'feature/1.9.32-加料商品开发' into qa · 04cf8047
  chongfu.liang committed Aug 09, 2020
  
  04cf8047 Browse Files
- 区分行号 · b6b77dff
  chongfu.liang committed Aug 09, 2020
  
  b6b77dff Browse Files
08 Aug, 2020 3 commits
- 去掉均摊 · a4888c28
  xiaoer.li@freemud.com committed Aug 08, 2020
  
  a4888c28 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
07 Aug, 2020 10 commits
- Merge branch '20200806-10000' of gitlab.freemud.com:order-group-application/order-group into qa · 1914ce04
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
```
  张洪旺 committed Aug 07, 2020
  1914ce04 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · cd7c2308
  xiaoer.li@freemud.com committed Aug 07, 2020
  
  cd7c2308 Browse Files
- fixbug · 975979ca
  xiaoer.li@freemud.com committed Aug 07, 2020
  
  975979ca Browse Files
- Merge branch 'feature/1.9.34-预支付失败记录消息到reason-肖家炜' into qa · a8ac5930
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	call-back-service/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
```
  vega committed Aug 07, 2020
  a8ac5930 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 07b1389e
  xiaoer.li@freemud.com committed Aug 07, 2020
  
  07b1389e 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 remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 36029123
  xiaoer.li@freemud.com committed Aug 07, 2020
  
  36029123 Browse Files
- fixbug · 6f848887
  xiaoer.li@freemud.com committed Aug 07, 2020
  
  6f848887 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 66b94990
  xiaoer.li@freemud.com committed Aug 07, 2020
  
  66b94990 Browse Files