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

03 Nov, 2020 15 commits
- assortment-ordercenter-sdk修改版本号为2.0.17-RELEASE · c9fac5bb
  刘鹏飞 committed Nov 03, 2020
  
  c9fac5bb Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20201022-refundReform-刘鹏飞' into master · b903b8df
  刘鹏飞 committed Nov 03, 2020
  
  b903b8df Browse Files
- 订单退款时间增加当天时间判断，assortment-ordercenter-sdk修改版本号为2.0.16-RELEASE · 7c89847e
  刘鹏飞 committed Nov 03, 2020
  
  7c89847e Browse Files
- 订单退款时间增加当天时间判断1 · 624070d3
  刘鹏飞 committed Nov 03, 2020
  
  624070d3 Browse Files
- 订单退款时间增加当天时间判断 · 98c23583
  刘鹏飞 committed Nov 03, 2020
  
  98c23583 Browse Files
- Merge remote-tracking branch 'origin/master' · 5cf282d9
  chongfu.liang committed Nov 03, 2020
  
  5cf282d9 Browse Files
- Merge branch 'feature/2.0.4-修改支持的订单类型' · f5bcc41d
  chongfu.liang committed Nov 03, 2020
  
  f5bcc41d Browse Files
- fix · 0ac2c552
  xiaoer.li@freemud.com committed Nov 03, 2020
  
  0ac2c552 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20201103-fix新算价异常' · 2d49b3fa
  xiaoer.li@freemud.com committed Nov 03, 2020
  
  2d49b3fa Browse Files
- fix · 53ce4c04
  xiaoer.li@freemud.com committed Nov 03, 2020
  
  53ce4c04 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20201103-fix新算价异常' · a5b0ef3d
  xiaoer.li@freemud.com committed Nov 03, 2020
  
  a5b0ef3d Browse Files
- fix · 43cbf31b
  xiaoer.li@freemud.com committed Nov 03, 2020
  
  43cbf31b Browse Files
- Merge remote-tracking branch 'origin/master' · 159f4cba
  chongfu.liang committed Nov 03, 2020
  
  159f4cba Browse Files
- fix · 21633612
  xiaoer.li@freemud.com committed Nov 03, 2020
  
  21633612 Browse Files
- 集点添加为空校验 · b065e277
  chongfu.liang committed Nov 03, 2020
  
  b065e277 Browse Files
02 Nov, 2020 3 commits
- Merge remote-tracking branch 'remotes/origin/feature/20201022-refundReform-刘鹏飞' into master · f0439a5c
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
```
  刘鹏飞 committed Nov 02, 2020
  f0439a5c Browse Files
- 升级assortment-ordercenter-sdk版本为2.0.16-RELEASE · 8169ef83
  刘鹏飞 committed Nov 02, 2020
  
  8169ef83 Browse Files
- 升级assortment-ordercenter-sdk版本为2.0.18-RELEASE · 3f4186b7
```
修改storecenter-sdk版本为3.1.9.RELEASE
```
  刘鹏飞 committed Nov 02, 2020
  3f4186b7 Browse Files
30 Oct, 2020 16 commits
- Merge branch 'feature-yu.sun-couponAvailable' · 7fa1ef62
  yu.sun committed Oct 31, 2020
  
  7fa1ef62 Browse Files
- Merge branch 'feature-yu.sun-material-20201030' · 76b74062
  yu.sun committed Oct 31, 2020
  
  76b74062 Browse Files
- sunyu::new function::about getAvailableCoupon · 02426f4d
  yu.sun committed Oct 31, 2020
  
  02426f4d Browse Files
- 合代码升级sdk · fca7721c
  徐康 committed Oct 30, 2020
  
  fca7721c Browse Files
- Merge branch '2020/10/29-fabu-huiyang' · 8ad0ed2d
  徐康 committed Oct 30, 2020
  
  8ad0ed2d Browse Files
- Merge branch 'feature/20201021_万能券展示问题_xukang' into 2020/10/29-fabu-huiyang · 1746007a
  徐康 committed Oct 30, 2020
  
  1746007a Browse Files
- Merge branch 'feature/20201015_麦咖啡允许重复申请退款_xukang' into 2020/10/29-fabu-huiyang · 897ad699
  徐康 committed Oct 30, 2020
  
  897ad699 Browse Files
- Merge branch '2020/10/06-随单购买月享卡-huiyang' into 2020/10/29-fabu-huiyang · 1b38dd66
  徐康 committed Oct 30, 2020
  
  1b38dd66 Browse Files
- 合代码 · e88c4d86
  徐康 committed Oct 30, 2020
  
  e88c4d86 Browse Files
- Merge branch '2020/10/29-fabu-huiyang' · 363a6d19
  huiyang.chen committed Oct 30, 2020
  
  363a6d19 Browse Files
- 月卡券展示问题 · 0674509b
  徐康 committed Oct 30, 2020
  
  0674509b Browse Files
- 修改状态类型 · cef02ec5
  chongfu.liang committed Oct 30, 2020
  
  cef02ec5 Browse Files
- 订单买卡 · ce6d9bb4
  徐康 committed Oct 30, 2020
  
  ce6d9bb4 Browse Files
- fix 随单购优惠提供给券码 · 864d4292
  huiyang.chen committed Oct 30, 2020
  
  864d4292 Browse Files
- 订单买卡 · 2a31e5df
  徐康 committed Oct 30, 2020
  
  2a31e5df Browse Files
- 订单拒单 · 11c1c80b
  徐康 committed Oct 30, 2020
  
  11c1c80b Browse Files
29 Oct, 2020 6 commits
- sunyu::fix::fix about clear deliveryAmount · 2567effe
  yu.sun committed Oct 30, 2020
  
  2567effe Browse Files
- Merge branch 'feature-yu.sun-material-20201030' of… · 96f501c2
```
Merge branch 'feature-yu.sun-material-20201030' of gitlab.freemud.com:order-group-application/order-group into feature-yu.sun-material-20201030
```
  yu.sun committed Oct 30, 2020
  96f501c2 Browse Files
- sunyu::fix::fix bug about SETMEAL_PRODUCT originalPrice sum · f84358b9
  yu.sun committed Oct 30, 2020
  
  f84358b9 Browse Files
- 促销计算加料商品spuid非空 · 29d993da
  ping.wu committed Oct 29, 2020
  
  29d993da Browse Files
- 套餐可选商品spuid赋值 · c01ca5dd
  ping.wu committed Oct 29, 2020
  
  c01ca5dd Browse Files
- sunyu::update::fix bug about specialAttribute copyOrder · 3b306630
  yu.sun committed Oct 29, 2020
  
  3b306630 Browse Files