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

10 Aug, 2020 1 commit
- 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 22 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
- 过滤非正常商品 · 186cd288
  xiaoer.li@freemud.com committed Aug 07, 2020
  
  186cd288 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · d1b2502d
  xiaoer.li@freemud.com committed Aug 07, 2020
  
  d1b2502d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 6dfefdea
  xiaoer.li@freemud.com committed Aug 07, 2020
  
  6dfefdea Browse Files
- 加料只做正常商品价格计算 · e4c55eaf
  xiaoer.li@freemud.com committed Aug 07, 2020
  
  e4c55eaf Browse Files
- Merge branch 'feature/1.9.32-加料商品开发' into qa · 0b98b853
  chongfu.liang committed Aug 07, 2020
  
  0b98b853 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 69ca4cd1
  chongfu.liang committed Aug 07, 2020
  
  69ca4cd1 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · ef70926e
  xiaoer.li@freemud.com committed Aug 07, 2020
  
  ef70926e Browse Files
- fix:促销没有活动返回 · ba7aeb3a
  xiaoer.li@freemud.com committed Aug 07, 2020
  
  ba7aeb3a Browse Files
- C端加料 · 1f797f10
  chongfu.liang committed Aug 07, 2020
  
  1f797f10 Browse Files
- 1.9.34 根据会员给的字段,添加推广门店名称字段 · 277660b3
  vega committed Aug 07, 2020
  
  277660b3 Browse Files
- Merge branch 'master' into feature/1.9.34-订单调开卡接口传门店id给会员-肖家炜 · 9b69cae2
  vega committed Aug 07, 2020
  
  9b69cae2 Browse Files
- 1.9.34 ID1013493 · 0a705fb9
```
【付费会员推广门店】【C端服务端】订单调开卡接口传门店id给会员
```
  vega committed Aug 07, 2020
  0a705fb9 Browse Files
06 Aug, 2020 8 commits
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 41fc8881
  xiaoer.li@freemud.com committed Aug 06, 2020
  
  41fc8881 Browse Files
- fix:促销没有活动返回 · 952928d5
  xiaoer.li@freemud.com committed Aug 06, 2020
  
  952928d5 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 9902952d
  xiaoer.li@freemud.com committed Aug 06, 2020
  
  9902952d Browse Files
- fix:促销没有活动返回 · 0d44c9c5
  xiaoer.li@freemud.com committed Aug 06, 2020
  
  0d44c9c5 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · f562cc28
  xiaoer.li@freemud.com committed Aug 06, 2020
  
  f562cc28 Browse Files
- debug · 6bc9f84e
  xiaoer.li@freemud.com committed Aug 06, 2020
  
  6bc9f84e Browse Files
- 商品sdk升级 · 156e0fd2
  xiaoer.li@freemud.com committed Aug 06, 2020
  
  156e0fd2 Browse Files
- 1 支持日志切面 · 53014e77
```
2 sdk-common-base  1.5.2.releas
```
  张洪旺 committed Aug 06, 2020
  53014e77 Browse Files
05 Aug, 2020 1 commit
- Merge remote-tracking branch 'origin/qa' into qa · 78f10a78
  chongfu.liang committed Aug 05, 2020
  
  78f10a78 Browse Files