Commits · 2f1e20e206f82ab91d9e69e3a89373a22c5919dd · order-group-application / order-group

06 May, 2020 1 commit

Merge branch 'master' into feature/20200423_订单oms逆向流程 · 2f1e20e2

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-management/pom.xml
#	order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java
#	order-management/src/main/java/cn/freemud/management/service/impl/OrderDeliveryService.java
#	order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java

committed May 06, 2020

2f1e20e2 Browse Files

27 Apr, 2020 10 commits
- 升级聚合订单sdk版本 · 986eb351
  shuhu.hou@freemud.cn committed Apr 27, 2020
  
  986eb351 Browse Files
- Merge remote-tracking branch 'origin/master' · 093618cb
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
```
  shuhu.hou@freemud.cn committed Apr 27, 2020
  093618cb Browse Files
- 配送费更新版本 · 38faa509
  姜海波 committed Apr 27, 2020
  
  38faa509 Browse Files
- 配送费更新版本 · 4cf222b1
  姜海波 committed Apr 27, 2020
  
  4cf222b1 Browse Files
- 配送费更新版本 · 464e94bd
  姜海波 committed Apr 27, 2020
  
  464e94bd Browse Files
- 配送费更新版本 · d85ffe00
  姜海波 committed Apr 27, 2020
  
  d85ffe00 Browse Files
- 升级聚合订单sdk版本 · d7b51f09
  shuhu.hou@freemud.cn committed Apr 27, 2020
  
  d7b51f09 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/4/16-1.9.20-满减配送费记录修改-海波' · e0969ea0
  姜海波 committed Apr 27, 2020
  
  e0969ea0 Browse Files
- Merge branch 'feature/20200420_oms接单二期' · 3736507e
  shuhu.hou@freemud.cn committed Apr 27, 2020
  
  3736507e Browse Files
- oms逆向单整理，代码优化 · 56b75b51
  shuhu.hou@freemud.cn committed Apr 27, 2020
  
  56b75b51 Browse Files
24 Apr, 2020 3 commits
- 非支付宝、微信渠道不创建配送单 · c7db13ba
  shuhu.hou@freemud.cn committed Apr 24, 2020
  
  c7db13ba Browse Files
- oms订单履单正向流程修复履单流程 · 28dd3104
  shuhu.hou@freemud.cn committed Apr 24, 2020
  
  28dd3104 Browse Files
- oms订单履单正向流程 · 37dea919
  shuhu.hou@freemud.cn committed Apr 24, 2020
  
  37dea919 Browse Files
23 Apr, 2020 3 commits
- Merge branch 'feature/20200420_oms接单二期' into feature/20200423_订单oms逆向流程 · b024c239
  shuhu.hou@freemud.cn committed Apr 23, 2020
  
  b024c239 Browse Files
- oms订单履单正向流程 · e80b5c1d
  shuhu.hou@freemud.cn committed Apr 23, 2020
  
  e80b5c1d Browse Files
- oms订单正向流程 · 2177ca8a
  shuhu.hou@freemud.cn committed Apr 23, 2020
  
  2177ca8a Browse Files
21 Apr, 2020 6 commits
- 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
- 抵价券优惠类型匹配 · 074e01b0
  ping.wu committed Apr 22, 2020
  
  074e01b0 Browse Files
- Merge branch 'master' of http://gitlab.freemud.com/order-group-application/order-group · f10eefda
  姜海波 committed Apr 21, 2020
  
  f10eefda Browse Files
- 增加默认配置 · e67d61e2
  姜海波 committed Apr 21, 2020
  
  e67d61e2 Browse Files
- 第三方外卖单配送费类型与新用户立减类型重复区分 · f25c5cf3
  ping.wu committed Apr 21, 2020
  
  f25c5cf3 Browse Files
- Merge branches 'feature/20200420_外卖配送费错误_wuping' and 'master' of… · 9d35a22e
```
Merge branches 'feature/20200420_外卖配送费错误_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Apr 21, 2020
  9d35a22e Browse Files
20 Apr, 2020 11 commits
- 升级聚合sdk及pom sdk版本 · 31f563db
  xiaoer.li@freemud.com committed Apr 20, 2020
  
  31f563db Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/套餐固定商品主食标识_1.9.19' · 8217313c
  xiaoer.li@freemud.com committed Apr 20, 2020
  
  8217313c Browse Files
- fix · e2392c5f
  xiaoer.li@freemud.com committed Apr 20, 2020
  
  e2392c5f Browse Files
- fix · 56cc6988
  xiaoer.li@freemud.com committed Apr 20, 2020
  
  56cc6988 Browse Files
- fix：isStaple · 7671da23
  xiaoer.li@freemud.com committed Apr 20, 2020
  
  7671da23 Browse Files
- fix：isStaple · 04c7e86b
  xiaoer.li@freemud.com committed Apr 20, 2020
  
  04c7e86b Browse Files
- 升级assortment-ordercenter-sdk版本为1.3.1.release · 4d0e7019
  shuhu.hou@freemud.cn committed Apr 20, 2020
  
  4d0e7019 Browse Files
- Merge branch 'feature/20200413_订单详情&下载' · 8a99be59
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
```
  shuhu.hou@freemud.cn committed Apr 20, 2020
  8a99be59 Browse Files
- 接单二期 · 34dbe1b4
  shuhu.hou@freemud.cn committed Apr 20, 2020
  
  34dbe1b4 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
18 Apr, 2020 1 commit
- 蜜雪创建订单 · 00f06ac3
  dingkai committed Apr 18, 2020
  
  00f06ac3 Browse Files
17 Apr, 2020 3 commits
- 修改配送费判断逻辑 · 3f671fe9
  姜海波 committed Apr 17, 2020
  
  3f671fe9 Browse Files
- 订单费用增加实际支出配送费 · b3ea6268
  姜海波 committed Apr 17, 2020
  
  b3ea6268 Browse Files
- fix:减少无效字符的设置 · de7030af
  xiaoer.li@freemud.com committed Apr 17, 2020
  
  de7030af Browse Files
13 Apr, 2020 2 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