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

13 Nov, 2020 2 commits
- fix bug · e39bd6a1
  huiyang.chen committed Nov 13, 2020
  
  e39bd6a1 Browse Files
- fix bug · c17546b4
  huiyang.chen committed Nov 13, 2020
  
  c17546b4 Browse Files
11 Nov, 2020 2 commits
- fix bug · e8ee51d6
  huiyang.chen committed Nov 11, 2020
  
  e8ee51d6 Browse Files
- fix 买三赠一对接促销 · e04de3ad
  huiyang.chen committed Nov 11, 2020
  
  e04de3ad Browse Files
10 Nov, 2020 1 commit
- fix 买三赠一对接促销 · 3cabd6a1
  huiyang.chen committed Nov 10, 2020
  
  3cabd6a1 Browse Files
09 Nov, 2020 1 commit
- fix 买三赠一更新商品数量 · 17f4e00d
  huiyang.chen committed Nov 09, 2020
  
  17f4e00d Browse Files
06 Nov, 2020 1 commit
- fix 买三赠一开发2 · e44d0ca0
  huiyang.chen committed Nov 06, 2020
  
  e44d0ca0 Browse Files
04 Nov, 2020 1 commit
- fix 买三赠一开发 · 5e0e5b74
  huiyang.chen committed Nov 04, 2020
  
  5e0e5b74 Browse Files
03 Nov, 2020 4 commits
- fix 买三赠一，todo · 3520d4c1
  huiyang.chen committed Nov 03, 2020
  
  3520d4c1 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 15 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
- 订单买卡 · 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 10 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
- sunyu::update::fix bug about specialAttribute copyOrder · bbdf752d
  yu.sun committed Oct 29, 2020
  
  bbdf752d Browse Files
- Merge branch 'feature-yu.sun-material-20201030' of… · 13a1533f
```
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 29, 2020
  13a1533f Browse Files
- sunyu::update::fix bug about specialAttribute copyOrder · d4acd63c
  yu.sun committed Oct 29, 2020
  
  d4acd63c Browse Files
- Merge branch 'feature-yu.sun-material-20201030' into 2020/10/29-fabu-huiyang · d6e507d3
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  徐康 committed Oct 29, 2020
  d6e507d3 Browse Files