Commits · 0f1ac12b703a16022c596410b3daf9c860d9bf8c · order-group-application / order-group · GitLab

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 16 commits
- 升级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 8 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
- 升级聚合sdk · ebc96fda
  dingkai committed Apr 16, 2020
  
  ebc96fda Browse Files
- Merge branch 'feature/1.9.20-蜜雪中台-dingkai' into develop · 865a09e5
  dingkai committed Apr 16, 2020
  
  865a09e5 Browse Files
- orderSourceType app · bbd38d82
  dingkai committed Apr 16, 2020
  
  bbd38d82 Browse Files
- Merge branch 'feature/1.9.20-蜜雪中台-dingkai' into develop · b70c881e
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
```
  dingkai committed Apr 16, 2020
  b70c881e Browse Files
- 升级聚合sdk · 55f74c48
  dingkai committed Apr 16, 2020
  
  55f74c48 Browse Files
- 蜜雪中台 · 905317bc
  dingkai committed Apr 16, 2020
  
  905317bc Browse Files
15 Apr, 2020 4 commits
- Merge remote-tracking branch 'remotes/origin/feature/1.9.18_订单_购物车_channel_鉴权' into develop · 296ace36
  xiaoer.li@freemud.com committed Apr 15, 2020
  
  296ace36 Browse Files
- pom · 433583c8
  xiaoer.li@freemud.com committed Apr 15, 2020
  
  433583c8 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/套餐固定商品主食标识_1.9.19' into develop · eb4b96b9
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
```
  xiaoer.li@freemud.com committed Apr 15, 2020
  eb4b96b9 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/套餐固定商品主食标识_1.9.19' into qa · fa1a003d
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
```
  xiaoer.li@freemud.com committed Apr 15, 2020
  fa1a003d Browse Files
14 Apr, 2020 1 commit
- Merge branch 'feature/1.9.19-蜜雪中台订单创建-dingkai' into qa · cb592078
```
# Conflicts:
#	order-application-service/pom.xml
```
  dingkai committed Apr 14, 2020
  cb592078 Browse Files
13 Apr, 2020 9 commits
- Merge remote-tracking branch 'remotes/origin/feature/1.9.18_订单_购物车_channel_鉴权' · 2520a548
  xiaoer.li@freemud.com committed Apr 13, 2020
  
  2520a548 Browse Files
- add：固定套餐商品标识商品是否为主食 · 32f51ebb
  xiaoer.li@freemud.com committed Apr 13, 2020
  
  32f51ebb Browse Files
- Merge branch 'feature/1.9.19-蜜雪中台订单创建-dingkai' into develop · c0f2ccd3
  dingkai committed Apr 13, 2020
  
  c0f2ccd3 Browse Files
- 升级聚合sdk · c90eb10a
  dingkai committed Apr 13, 2020
  
  c90eb10a Browse Files
- 升级聚合sdk · 0a26ff2d
  dingkai committed Apr 13, 2020
  
  0a26ff2d Browse Files
- Merge branch 'feature/1.9.19-蜜雪中台订单创建-dingkai' into develop · 1987bfdb
  dingkai committed Apr 13, 2020
  
  1987bfdb Browse Files
- 取消原因修好 · d051ad4b
  dingkai committed Apr 13, 2020
  
  d051ad4b Browse Files
- 升级聚合订单sdk · fdaf8e1d
  shuhu.hou@freemud.cn committed Apr 13, 2020
  
  fdaf8e1d Browse Files
- Merge branch 'feature/20200407_取消订单闭环' · 91661c55
  shuhu.hou@freemud.cn committed Apr 13, 2020
  
  91661c55 Browse Files