Commits · 64bfc023ae7cc41691a5dcb98f3dbf59c48fe7f2 · order-group-application / order-group

11 May, 2020 1 commit

Merge branch 'feature/1.9.22-蜜雪预支付-20200430-dingkai' into qa · 64bfc023

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/AppOrderService.java
#	order-application-service/src/main/java/cn/freemud/service/OrderAdapterService.java
#	order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java

committed May 11, 2020

64bfc023 Browse Files

09 May, 2020 3 commits
- 修改 json 转换错误 · 76a44604
  姜海波 committed May 09, 2020
  
  76a44604 Browse Files
- Merge branch 'feature/1.9.21-配送费20200424-dingkai' into qa · 244ac39a
  dingkai committed May 09, 2020
  
  244ac39a Browse Files
- 配送费逻辑默认走旧的 · 6c5a379e
  dingkai committed May 09, 2020
  
  6c5a379e Browse Files
08 May, 2020 4 commits
- Merge branch 'feature/20200423_订单oms逆向流程' into qa · e66497dc
  shuhu.hou@freemud.cn committed May 08, 2020
  
  e66497dc Browse Files
- 订单非完成状态也要支持退配送费 · 91070139
  shuhu.hou@freemud.cn committed May 08, 2020
  
  91070139 Browse Files
- Merge branches 'feature/20200423_蜜雪新下单接口_wuping' and 'qa' of… · be9ff79b
```
Merge branches 'feature/20200423_蜜雪新下单接口_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed May 08, 2020
  be9ff79b Browse Files
- 积分抵扣描述修改 · da581850
  ping.wu committed May 08, 2020
  
  da581850 Browse Files
07 May, 2020 31 commits
- Merge branch 'feature/20200506_订单分发器日志' into qa · 508c1108
  shuhu.hou@freemud.cn committed May 07, 2020
  
  508c1108 Browse Files
- 订单分发器添加日志 · d03a48a3
  shuhu.hou@freemud.cn committed May 07, 2020
  
  d03a48a3 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · c611cdcd
  xiaoer.li@freemud.com committed May 07, 2020
  
  c611cdcd Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.20_查询促销补门店和渠道分支ID' into qa · 5f5909f5
  xiaoer.li@freemud.com committed May 07, 2020
  
  5f5909f5 Browse Files
- fix:orgIds · 96306dfb
  xiaoer.li@freemud.com committed May 07, 2020
  
  96306dfb Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 744e4141
  ping.wu committed May 07, 2020
  
  744e4141 Browse Files
- 测试版聚合订单sdk · 03d929d0
  ping.wu committed May 07, 2020
  
  03d929d0 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 2c8bea26
  xiaoer.li@freemud.com committed May 07, 2020
  
  2c8bea26 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.20_查询促销补门店和渠道分支ID' into qa · bd70dfc8
  xiaoer.li@freemud.com committed May 07, 2020
  
  bd70dfc8 Browse Files
- fix:orgIds · 5dc2e788
  xiaoer.li@freemud.com committed May 07, 2020
  
  5dc2e788 Browse Files
- Merge branch 'feature/20200423_订单oms逆向流程' into qa · 05aee4e7
  shuhu.hou@freemud.cn committed May 07, 2020
  
  05aee4e7 Browse Files
- 退款退配送费 · c3455215
  shuhu.hou@freemud.cn committed May 07, 2020
  
  c3455215 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.20_查询促销补门店和渠道分支ID' into qa · b24af54a
  xiaoer.li@freemud.com committed May 07, 2020
  
  b24af54a Browse Files
- 消息中心新增字段升级sdk版本 · 359c2dcd
  shuhu.hou@freemud.cn committed May 07, 2020
  
  359c2dcd Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 9931e427
  shuhu.hou@freemud.cn committed May 07, 2020
  
  9931e427 Browse Files
- Merge branch 'feature/20200423_订单oms逆向流程' into qa · 54e2881b
  shuhu.hou@freemud.cn committed May 07, 2020
  
  54e2881b Browse Files
- Merge branches 'feature/20200507_配置修改_明警' and 'qa' of… · f100096f
```
Merge branches 'feature/20200507_配置修改_明警' and 'qa' of gitlab.freemud.com:order-group-application/order-group into qa
```
  张明警 committed May 07, 2020
  f100096f Browse Files
- 升级会员sdk · aee9b372
  张明警 committed May 07, 2020
  
  aee9b372 Browse Files
- 消息中心新增字段 · dcdee5d1
  shuhu.hou@freemud.cn committed May 07, 2020
  
  dcdee5d1 Browse Files
- Merge branches 'feature/20200507_配置修改_明警' and 'qa' of… · 43569255
```
Merge branches 'feature/20200507_配置修改_明警' and 'qa' of gitlab.freemud.com:order-group-application/order-group into qa
```
  张明警 committed May 07, 2020
  43569255 Browse Files
- 升级会员sdk，修改调用会员接口的方法名 · 5087ac96
  张明警 committed May 07, 2020
  
  5087ac96 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2020323_1.9.17_rocketmq' into qa · e65552ec
  胡超 committed May 07, 2020
  
  e65552ec Browse Files
- RocketMQProperties · 2eb49431
  胡超 committed May 07, 2020
  
  2eb49431 Browse Files
- Merge branches 'feature/20200507_配置修改_明警' and 'qa' of… · 33cdd3ea
```
Merge branches 'feature/20200507_配置修改_明警' and 'qa' of gitlab.freemud.com:order-group-application/order-group into qa
```
  张明警 committed May 07, 2020
  33cdd3ea Browse Files
- 升级会员sdk，修改调用会员接口的方法名 · f1520ef7
  张明警 committed May 07, 2020
  
  f1520ef7 Browse Files
- Merge branches 'feature/20200507_配置修改_明警' and 'qa' of… · b3e3a17a
```
Merge branches 'feature/20200507_配置修改_明警' and 'qa' of gitlab.freemud.com:order-group-application/order-group into qa
```
  张明警 committed May 07, 2020
  b3e3a17a Browse Files
- Merge branch 'feature/20200423_订单oms逆向流程' into qa · 16adef4e
  shuhu.hou@freemud.cn committed May 07, 2020
  
  16adef4e Browse Files
- 升级会员sdk · afa3b5f0
  张明警 committed May 07, 2020
  
  afa3b5f0 Browse Files
- 忽略门店商户校验，兼容爱马哥 · 6451ddd8
  shuhu.hou@freemud.cn committed May 07, 2020
  
  6451ddd8 Browse Files
- 支付回调 · 65891bdf
  dingkai committed May 07, 2020
  
  65891bdf Browse Files
- app预支付、支付回调改造 · d97450d0
  dingkai committed May 07, 2020
  
  d97450d0 Browse Files
06 May, 2020 1 commit
- Merge branch 'feature/2020323_1.9.17_rocketmq' into qa · 1a4ce0f9
  胡超 committed May 06, 2020
  
  1a4ce0f9 Browse Files