Commits · 93f01e22ce4390183eab79bf1973d107d22379ab · order-group-application / order-group · GitLab

17 Apr, 2020 4 commits
- 订单费用增加实际支出配送费 · 93f01e22
  姜海波 committed Apr 17, 2020
  
  93f01e22 Browse Files
- 订单费用增加实际支出配送费 · b3ea6268
  姜海波 committed Apr 17, 2020
  
  b3ea6268 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 22 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
- Merge branch 'feature/20200325_oms接单' · 257b7f5a
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
```
  shuhu.hou@freemud.cn committed Apr 13, 2020
  257b7f5a Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 42638c2b
  shuhu.hou@freemud.cn committed Apr 13, 2020
  
  42638c2b Browse Files
- 升级聚合订单sdk · 9b8452c6
  shuhu.hou@freemud.cn committed Apr 13, 2020
  
  9b8452c6 Browse Files
- Merge branch 'feature/1.9.19-蜜雪中台订单创建-dingkai' into develop · 3f4f419a
  dingkai committed Apr 13, 2020
  
  3f4f419a Browse Files
- 恢复 · 05bc822b
  dingkai committed Apr 13, 2020
  
  05bc822b Browse Files
- 蜜雪app创建订单、创建预支付 · 8972633d
  dingkai committed Apr 13, 2020
  
  8972633d Browse Files
- Merge branch 'feature/20200413_订单详情&下载' into develop · 64808d1b
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
```
  shuhu.hou@freemud.cn committed Apr 13, 2020
  64808d1b Browse Files
- 查询订单response新增平台优惠商家优惠 · abbcf068
  shuhu.hou@freemud.cn committed Apr 13, 2020
  
  abbcf068 Browse Files
- 增加延时队列选项 2 3 分钟 · 829b8dac
  姜海波 committed Apr 13, 2020
  
  829b8dac Browse Files
- 增加延时队列选项 2 3 分钟 · abe4a109
  姜海波 committed Apr 13, 2020
  
  abe4a109 Browse Files
- 查询订单response新增平台优惠商家优惠 · 75330acf
  shuhu.hou@freemud.cn committed Apr 13, 2020
  
  75330acf Browse Files
- 升级sdk版本 · 23cb2cc9
  shuhu.hou@freemud.cn committed Apr 13, 2020
  
  23cb2cc9 Browse Files
- Merge branch 'feature/20200407_订单下载统计' · d9b1cc4f
  shuhu.hou@freemud.cn committed Apr 13, 2020
  
  d9b1cc4f Browse Files
10 Apr, 2020 1 commit
- Merge remote-tracking branch 'remotes/origin/feature/1.9.18_订单_购物车_channel_鉴权' into qa · bc6de12e
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/aop/WebAspect.java
```
  xiaoer.li@freemud.com committed Apr 10, 2020
  bc6de12e Browse Files