Commits · 6eeb460253a6ec7b3d855321fed4b61535822a2c · order-group-application / order-group · GitLab

24 Apr, 2020 8 commits
- 订单渠道类型新增支付宝渠道 · 6eeb4602
  shuhu.hou@freemud.cn committed Apr 24, 2020
  
  6eeb4602 Browse Files
- Merge branch 'feature/20200420_oms接单二期' into develop · aef1b803
  shuhu.hou@freemud.cn committed Apr 24, 2020
  
  aef1b803 Browse Files
- oms订单履单正向流程修复履单流程 · 28dd3104
  shuhu.hou@freemud.cn committed Apr 24, 2020
  
  28dd3104 Browse Files
- 优化ES 查询sdk · 0d19821e
  姜海波 committed Apr 24, 2020
  
  0d19821e Browse Files
- Merge branch 'develop' of… · 6513658e
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  姜海波 committed Apr 24, 2020
  6513658e Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/4/23-1.9.21-ES查询SDK方法升级-海波' into develop · 6dfd6267
  姜海波 committed Apr 24, 2020
  
  6dfd6267 Browse Files
- 优化ES 查询sdk · fc93d28c
  姜海波 committed Apr 24, 2020
  
  fc93d28c Browse Files
- oms订单履单正向流程 · 37dea919
  shuhu.hou@freemud.cn committed Apr 24, 2020
  
  37dea919 Browse Files
23 Apr, 2020 21 commits
- Merge remote-tracking branch 'remotes/origin/feature/1.9.20_发票上报' into develop · 0b73c017
  xiaoer.li@freemud.com committed Apr 23, 2020
  
  0b73c017 Browse Files
- 修饰日志 · 8172258b
  xiaoer.li@freemud.com committed Apr 23, 2020
  
  8172258b Browse Files
- 升级sdk · a593c948
  xiaoer.li@freemud.com committed Apr 23, 2020
  
  a593c948 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.20_异常单查询' into develop · 21c6d896
  xiaoer.li@freemud.com committed Apr 23, 2020
  
  21c6d896 Browse Files
- 放开常用方法访问修饰符 · 82032915
  xiaoer.li@freemud.com committed Apr 23, 2020
  
  82032915 Browse Files
- Merge branch 'feature/20200420_oms接单二期' into develop · ad88dd88
  shuhu.hou@freemud.cn committed Apr 23, 2020
  
  ad88dd88 Browse Files
- oms订单履单正向流程 · e80b5c1d
  shuhu.hou@freemud.cn committed Apr 23, 2020
  
  e80b5c1d Browse Files
- Merge branch 'develop' of… · 4f5b2875
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
```
  姜海波 committed Apr 23, 2020
  4f5b2875 Browse Files
- Merge branch 'develop' of… · 9f6c8df5
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
```
  姜海波 committed Apr 23, 2020
  9f6c8df5 Browse Files
- 预约单 · 3f72954a
  姜海波 committed Apr 23, 2020
  
  3f72954a Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/4/23-1.9.21-预约单-海波' into develop · 051c7bec
  姜海波 committed Apr 23, 2020
  
  051c7bec Browse Files
- 预约单 · 2ad120c4
  姜海波 committed Apr 23, 2020
  
  2ad120c4 Browse Files
- 聚合订单sdk升级 · fbd5769d
  shuhu.hou@freemud.cn committed Apr 23, 2020
  
  fbd5769d Browse Files
- oms订单正向流程 · 9a788156
  shuhu.hou@freemud.cn committed Apr 23, 2020
  
  9a788156 Browse Files
- 升级order-management pom · e112d98e
  xiaoer.li@freemud.com committed Apr 23, 2020
  
  e112d98e Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.20_发票上报' into develop · 4f7c3f98
  xiaoer.li@freemud.com committed Apr 23, 2020
  
  4f7c3f98 Browse Files
- 增加流转数据记录 · a1a5c7a5
  xiaoer.li@freemud.com committed Apr 23, 2020
  
  a1a5c7a5 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.20_发票上报' into develop · 3315b1c0
  xiaoer.li@freemud.com committed Apr 23, 2020
  
  3315b1c0 Browse Files
- 指定订单数据写入mq及补推订单数据工具 · 0969b437
  xiaoer.li@freemud.com committed Apr 23, 2020
  
  0969b437 Browse Files
- Merge branch 'feature/20200420_oms接单二期' into develop · d1019bdb
  shuhu.hou@freemud.cn committed Apr 23, 2020
  
  d1019bdb Browse Files
- oms订单正向流程 · 2177ca8a
  shuhu.hou@freemud.cn committed Apr 23, 2020
  
  2177ca8a Browse Files
22 Apr, 2020 10 commits
- Merge branch 'feature/1.9.20-蜜雪中台-dingkai' into develop · cf9d5b55
  dingkai committed Apr 22, 2020
  
  cf9d5b55 Browse Files
- jar升级 · b59627a0
  dingkai committed Apr 22, 2020
  
  b59627a0 Browse Files
- jar升级 · d31d218a
  dingkai committed Apr 22, 2020
  
  d31d218a Browse Files
- Merge branch 'feature/1.9.20-蜜雪中台-dingkai' into develop · 595ea53f
  dingkai committed Apr 22, 2020
  
  595ea53f Browse Files
- 蜜雪查询app · 10f29775
  dingkai committed Apr 22, 2020
  
  10f29775 Browse Files
- Merge branch 'feature/1.9.20-蜜雪中台-dingkai' into develop · 84eb455e
  dingkai committed Apr 22, 2020
  
  84eb455e Browse Files
- 蜜雪预支付 · 36bbab05
  dingkai committed Apr 22, 2020
  
  36bbab05 Browse Files
- Merge branch 'develop' of… · c7398d8a
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
```
  姜海波 committed Apr 22, 2020
  c7398d8a Browse Files
- Merge branch 'feature/1.9.21-mockpaysuccess-20190422dingkai' into develop · 005e93c2
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
#	order-management/pom.xml
```
  dingkai committed Apr 22, 2020
  005e93c2 Browse Files
- mock pay · eb774921
  dingkai committed Apr 22, 2020
  
  eb774921 Browse Files
21 Apr, 2020 1 commit
- Merge branches 'feature/20200420_外卖配送费错误_wuping' and 'master' of… · 731cade8
```
Merge branches 'feature/20200420_外卖配送费错误_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Apr 22, 2020
  731cade8 Browse Files