Commits · 3d963611c15bb72b4f61593e7328fdd7432e3256 · order-group-application / order-group · GitLab

21 Apr, 2020 3 commits
- 修改配置顺序 · 3d963611
  姜海波 committed Apr 21, 2020
  
  3d963611 Browse Files
- log · dd442ff7
  dingkai committed Apr 21, 2020
  
  dd442ff7 Browse Files
- log · 64262487
  dingkai committed Apr 21, 2020
  
  64262487 Browse Files
20 Apr, 2020 16 commits
- Merge remote-tracking branch 'remotes/origin/feature/套餐固定商品主食标识_1.9.19' into develop · c77e3ecd
  xiaoer.li@freemud.com committed Apr 20, 2020
  
  c77e3ecd Browse Files
- fix · e2392c5f
  xiaoer.li@freemud.com committed Apr 20, 2020
  
  e2392c5f Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/套餐固定商品主食标识_1.9.19' into develop · 58aed566
  xiaoer.li@freemud.com committed Apr 20, 2020
  
  58aed566 Browse Files
- fix · 56cc6988
  xiaoer.li@freemud.com committed Apr 20, 2020
  
  56cc6988 Browse Files
- 升级assortment-ordercenter-sdk 1.4.9-SNAPSHOT · b6a73aab
  xiaoer.li@freemud.com committed Apr 20, 2020
  
  b6a73aab Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/套餐固定商品主食标识_1.9.19' into develop · 76dc9ed1
  xiaoer.li@freemud.com committed Apr 20, 2020
  
  76dc9ed1 Browse Files
- fix：isStaple · 7671da23
  xiaoer.li@freemud.com committed Apr 20, 2020
  
  7671da23 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/套餐固定商品主食标识_1.9.19' into develop · 900f0798
  xiaoer.li@freemud.com committed Apr 20, 2020
  
  900f0798 Browse Files
- fix：isStaple · 04c7e86b
  xiaoer.li@freemud.com committed Apr 20, 2020
  
  04c7e86b Browse Files
- Merge branches 'develop' and 'feature/20200420_外卖配送费错误_wuping' of… · 04e60863
```
Merge branches 'develop' and 'feature/20200420_外卖配送费错误_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
```
  ping.wu committed Apr 20, 2020
  04e60863 Browse Files
- 匹配优惠类型：新用户立减 · 43629ad9
  ping.wu committed Apr 20, 2020
  
  43629ad9 Browse Files
- Merge branch 'feature/1.9.19-蜜雪中台订单创建-dingkai' · f784b8f1
```
# Conflicts:
#	order-application-service/pom.xml
```
  dingkai committed Apr 20, 2020
  f784b8f1 Browse Files
- Merge branch 'feature/1.9.20-蜜雪中台-dingkai' into develop · f190d3b1
  dingkai committed Apr 20, 2020
  
  f190d3b1 Browse Files
- 支付jar更新 · 393e75d8
  dingkai committed Apr 20, 2020
  
  393e75d8 Browse Files
- Merge branch 'feature/1.9.20-蜜雪中台-dingkai' into develop · daf0e290
  dingkai committed Apr 20, 2020
  
  daf0e290 Browse Files
- 蜜雪创建预支付 · 2b335fa2
  dingkai committed Apr 20, 2020
  
  2b335fa2 Browse Files
18 Apr, 2020 2 commits
- Merge branch 'feature/1.9.19-蜜雪中台订单创建-dingkai' into develop · 0f1ac12b
  dingkai committed Apr 18, 2020
  
  0f1ac12b Browse Files
- 蜜雪创建订单 · 00f06ac3
  dingkai committed Apr 18, 2020
  
  00f06ac3 Browse Files
17 Apr, 2020 17 commits
- 修改配送费判断逻辑 · 3f671fe9
  姜海波 committed Apr 17, 2020
  
  3f671fe9 Browse Files
- 升级ordercenter-sdk到1.3.2 · c00631ca
  xiaoer.li@freemud.com committed Apr 17, 2020
  
  c00631ca Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.20_异常单查询' into develop · b4b70f3d
  xiaoer.li@freemud.com committed Apr 17, 2020
  
  b4b70f3d Browse Files
- ES 查询增加 List<Integer> abnormalStatuses · e7abbb79
  xiaoer.li@freemud.com committed Apr 17, 2020
  
  e7abbb79 Browse Files
- Merge branch 'develop' of… · 89607448
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	assortment-ordercenter-sdk/readme.md
```
  姜海波 committed Apr 17, 2020
  89607448 Browse Files
- Merge branch 'develop' of… · c3f5ce02
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	assortment-ordercenter-sdk/readme.md
```
  姜海波 committed Apr 17, 2020
  c3f5ce02 Browse Files
- Merge branch 'develop' of… · b9ccb611
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	assortment-ordercenter-sdk/readme.md
```
  姜海波 committed Apr 17, 2020
  b9ccb611 Browse Files
- Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · 6a0d8490
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/resources/application-qa.properties
```
  姜海波 committed Apr 17, 2020
  6a0d8490 Browse Files
- Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · 10c82367
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/resources/application-qa.properties
```
  姜海波 committed Apr 17, 2020
  10c82367 Browse Files
- 升级sdk · 9e69d0e3
  xiaoer.li@freemud.com committed Apr 17, 2020
  
  9e69d0e3 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/套餐固定商品主食标识_1.9.19' into develop · b50aec9d
  xiaoer.li@freemud.com committed Apr 17, 2020
  
  b50aec9d Browse Files
- 升级版本 · 15623dc9
  姜海波 committed Apr 17, 2020
  
  15623dc9 Browse Files
- 订单费用增加实际支出配送费 · 93f01e22
  姜海波 committed Apr 17, 2020
  
  93f01e22 Browse Files
- 订单费用增加实际支出配送费 · b3ea6268
  姜海波 committed Apr 17, 2020
  
  b3ea6268 Browse Files
- fix:减少无效字符的设置 · de7030af
  xiaoer.li@freemud.com committed Apr 17, 2020
  
  de7030af Browse Files
- Merge branch 'feature/1.9.20-蜜雪中台-dingkai' into develop · c03809cb
  dingkai committed Apr 17, 2020
  
  c03809cb Browse Files
- app orderClientType · eca34250
  dingkai committed Apr 17, 2020
  
  eca34250 Browse Files
16 Apr, 2020 2 commits
- Merge branch 'feature/1.9.20-蜜雪中台-dingkai' into develop · b059de8e
```
# Conflicts:
#	order-application-service/pom.xml
```
  dingkai committed Apr 16, 2020
  b059de8e Browse Files
- 支付jar升级 · ac10474b
  dingkai committed Apr 16, 2020
  
  ac10474b Browse Files