Commits · 861b8bacc5e14e6b69284dc9302b4b11aed03811 · order-group-application / order-group · GitLab

25 Sep, 2020 17 commits
- sdk异常 · 861b8bac
  徐康 committed Sep 25, 2020
  
  861b8bac Browse Files
- Merge branch 'bugfix/20200924_修复问题临时分支' into qa · f85cc380
  徐康 committed Sep 25, 2020
  
  f85cc380 Browse Files
- 记录券的功能暂时不用 · a25e4aeb
  徐康 committed Sep 25, 2020
  
  a25e4aeb Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into qa · 4149507a
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  徐康 committed Sep 25, 2020
  4149507a Browse Files
- Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · 96ab0b53
  徐康 committed Sep 25, 2020
  
  96ab0b53 Browse Files
- mccafe套餐价格重新计算 · d0fc102f
  徐康 committed Sep 25, 2020
  
  d0fc102f Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 7390b074
  xiaoer.li@freemud.com committed Sep 25, 2020
  
  7390b074 Browse Files
- 对接促销算价Alpha->fix · c9d59aa9
  xiaoer.li@freemud.com committed Sep 25, 2020
  
  c9d59aa9 Browse Files
- test方法 · ca291e74
  徐康 committed Sep 25, 2020
  
  ca291e74 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 9afec4e9
  xiaoer.li@freemud.com committed Sep 25, 2020
  
  9afec4e9 Browse Files
- 对接促销算价Alpha->fix · 4b29012a
  xiaoer.li@freemud.com committed Sep 25, 2020
  
  4b29012a Browse Files
- Merge remote-tracking branch 'origin/bugfix/20200924_修复问题临时分支' into bugfix/20200924_修复问题临时分支 · f33b5737
  徐康 committed Sep 25, 2020
  
  f33b5737 Browse Files
- 只取discounts里面的优惠，不取coupondiscounts里面的 · a54949cb
  徐康 committed Sep 25, 2020
  
  a54949cb Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 394d674e
  xiaoer.li@freemud.com committed Sep 25, 2020
  
  394d674e Browse Files
- 对接促销算价Alpha->fix · 6ebbd44e
  xiaoer.li@freemud.com committed Sep 25, 2020
  
  6ebbd44e Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 0b25ee15
  xiaoer.li@freemud.com committed Sep 25, 2020
  
  0b25ee15 Browse Files
- 对接促销算价Alpha->fix · 16cef022
  xiaoer.li@freemud.com committed Sep 25, 2020
  
  16cef022 Browse Files
24 Sep, 2020 23 commits
- Merge branch 'bugfix/20200918_麦咖啡修复订单信息展示问题' into qa · 35090c98
  徐康 committed Sep 24, 2020
  
  35090c98 Browse Files
- Merge branch 'bugfix/20200918_麦咖啡修复订单信息展示问题' into bugfix/20200924_修复问题临时分支 · a073bd0d
  徐康 committed Sep 24, 2020
  
  a073bd0d Browse Files
- 套餐类型转换 · 3578d1b9
  徐康 committed Sep 24, 2020
  
  3578d1b9 Browse Files
- Merge branch 'bugfix/20200918_麦咖啡修复订单信息展示问题' into bugfix/20200924_修复问题临时分支 · 0a91b9ca
  徐康 committed Sep 24, 2020
  
  0a91b9ca Browse Files
- 记录和读取上次使用的优惠券 · d19d56aa
  徐康 committed Sep 24, 2020
  
  d19d56aa Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 22c3b0c5
  xiaoer.li@freemud.com committed Sep 24, 2020
  
  22c3b0c5 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 44771e92
  xiaoer.li@freemud.com committed Sep 24, 2020
  
  44771e92 Browse Files
- 对接促销算价Alpha->fix · 9e6012cd
  xiaoer.li@freemud.com committed Sep 24, 2020
  
  9e6012cd Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · a006226a
  孙昱 committed Sep 24, 2020
  
  a006226a Browse Files
- Merge branch 'feature-yu.sun-20200915-new' into qa · 26e58eb6
  孙昱 committed Sep 24, 2020
  
  26e58eb6 Browse Files
- Merge branch 'feature-yu.sun-20200915-new' of… · 778efb70
```
Merge branch 'feature-yu.sun-20200915-new' of gitlab.freemud.com:order-group-application/order-group into feature-yu.sun-20200915-new
```
  孙昱 committed Sep 24, 2020
  778efb70 Browse Files
- sunyu::update::fix bug about switch api · 06496a8b
  孙昱 committed Sep 24, 2020
  
  06496a8b Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 68e2ee75
  xiaoer.li@freemud.com committed Sep 24, 2020
  
  68e2ee75 Browse Files
- 对接促销算价Alpha->fix · 84c439fc
  xiaoer.li@freemud.com committed Sep 24, 2020
  
  84c439fc Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · d158e453
  xiaoer.li@freemud.com committed Sep 24, 2020
  
  d158e453 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · b944879e
  徐康 committed Sep 24, 2020
  
  b944879e Browse Files
- Merge branch 'feature-yu.sun-20200915-new' into qa · ba63ee26
  徐康 committed Sep 24, 2020
  
  ba63ee26 Browse Files
- 套餐价格不需要乘以商品数量 · e069217c
  徐康 committed Sep 24, 2020
  
  e069217c Browse Files
- 对接促销算价Alpha->fix · e5feb2e7
  xiaoer.li@freemud.com committed Sep 24, 2020
  
  e5feb2e7 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · c1d334cc
  xiaoer.li@freemud.com committed Sep 24, 2020
  
  c1d334cc Browse Files
- 对接促销算价Alpha->fix · ff2bb994
  xiaoer.li@freemud.com committed Sep 24, 2020
  
  ff2bb994 Browse Files
- 前端传remove，则删除记录的code · 1a4e5269
  徐康 committed Sep 24, 2020
  
  1a4e5269 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 24618885
  xiaoer.li@freemud.com committed Sep 24, 2020
  
  24618885 Browse Files