Commits · a570cd57f38b74f7ecfeebdbcb40c5a0d0be1438 · order-group-application / order-group · GitLab

27 Jul, 2022 4 commits
- Merge branch 'feature/20220726_提供公共支付查询接口_wuping' of… · a570cd57
```
Merge branch 'feature/20220726_提供公共支付查询接口_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Jul 27, 2022
  a570cd57 Browse Files
- 名称修改 · baa110f8
  ping.wu committed Jul 27, 2022
  
  baa110f8 Browse Files
- Merge branch 'ka-bugfix-新增接口用于补偿发券工作' into qa · f56ce51a
  周晓航 committed Jul 27, 2022
  
  f56ce51a Browse Files
- 临时新增发券补偿接口 · 293c0fd6
  周晓航 committed Jul 27, 2022
  
  293c0fd6 Browse Files
26 Jul, 2022 6 commits
- Merge branch 'KA-订单MQ功能迁移-zxh' · 28327a74
  周晓航 committed Jul 26, 2022
  
  28327a74 Browse Files
- 支付结果查询mq-(会员，点餐下单公共),死信队列 · c89b7f02
  ping.wu committed Jul 26, 2022
  
  c89b7f02 Browse Files
- Merge branch 'KA-华莱士抽奖跳转百世新增接口' into qa · 06a98391
  周晓航 committed Jul 26, 2022
  
  06a98391 Browse Files
- Merge branch 'KA-华莱士抽奖跳转百世新增接口' · 556ef644
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
```
  周晓航 committed Jul 26, 2022
  556ef644 Browse Files
- 维护给前端弹框字段 · 574bdf06
  周晓航 committed Jul 26, 2022
  
  574bdf06 Browse Files
- Merge branch 'KA-维护对接订单基础新增字段' into qa · db1380f6
  周晓航 committed Jul 26, 2022
  
  db1380f6 Browse Files
22 Jul, 2022 4 commits
- 维护给前端弹框字段 · a15ebe1d
  周晓航 committed Jul 22, 2022
  
  a15ebe1d Browse Files
- Merge branch 'KA-华莱士抽奖跳转百世新增接口' into qa · ceb89c54
  周晓航 committed Jul 22, 2022
  
  ceb89c54 Browse Files
- 维护给前端弹框字段 · 2970b442
  周晓航 committed Jul 22, 2022
  
  2970b442 Browse Files
- 维护基础服务新增字段 · 8d1747d5
  周晓航 committed Jul 22, 2022
  
  8d1747d5 Browse Files
21 Jul, 2022 9 commits
- Merge branch 'feature/订单推送改造' · 1495b1c9
  查志伟 committed Jul 22, 2022
  
  1495b1c9 Browse Files
- 修复未配置部分商户时推送切换错误 · a3007f97
  查志伟 committed Jul 22, 2022
  
  a3007f97 Browse Files
- Merge branch 'KA-订单MQ功能迁移-zxh' into qa · d3392d7b
  周晓航 committed Jul 21, 2022
  
  d3392d7b Browse Files
- 新增响应日志, 方便生产查问题 · 214c45a1
  周晓航 committed Jul 21, 2022
  
  214c45a1 Browse Files
- Merge branch 'KA-华莱士抽奖跳转百世新增接口' into qa · 97b3a442
  周晓航 committed Jul 21, 2022
  
  97b3a442 Browse Files
- 新增调用记录响应用于方便测试 · 32e54056
  周晓航 committed Jul 21, 2022
  
  32e54056 Browse Files
- Merge branch 'feature/订单推送改造' · 40ea11f5
  查志伟 committed Jul 21, 2022
  
  40ea11f5 Browse Files
- Merge branch 'KA-华莱士抽奖跳转百世新增接口' into qa · a94253f0
  周晓航 committed Jul 21, 2022
  
  a94253f0 Browse Files
- 华莱士的百事抽奖新增订单类型校验 · 8fed97e7
  周晓航 committed Jul 21, 2022
  
  8fed97e7 Browse Files
20 Jul, 2022 4 commits
- Merge branch 'feature/订单推送改造' into qa · 4e27db46
  查志伟 committed Jul 20, 2022
  
  4e27db46 Browse Files
- 订单推送入参增加门店号 · c77e5d0f
  查志伟 committed Jul 20, 2022
  
  c77e5d0f Browse Files
- Merge branch 'KA-华莱士抽奖跳转百世新增接口' into qa · e480cce9
  周晓航 committed Jul 20, 2022
  
  e480cce9 Browse Files
- 优化接口,防止有遗漏没用通知百事的情况 · 5daae9b5
  周晓航 committed Jul 20, 2022
  
  5daae9b5 Browse Files
19 Jul, 2022 4 commits
- Merge branch 'ka-促销需要商品券的spuid' · cc1c7b75
  周晓航 committed Jul 19, 2022
  
  cc1c7b75 Browse Files
- Merge branch 'KA-华莱士抽奖跳转百世新增接口' into qa · 4fdb0f6f
  周晓航 committed Jul 19, 2022
  
  4fdb0f6f Browse Files
- 对接光兴外部接口 · f65ec39c
  周晓航 committed Jul 19, 2022
  
  f65ec39c Browse Files
- Merge branch 'KA-华莱士抽奖跳转百世新增接口' into qa · 9012fd7b
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
```
  周晓航 committed Jul 19, 2022
  9012fd7b Browse Files
18 Jul, 2022 3 commits
- 去掉邮件告警 · b3bc8ba6
  查志伟 committed Jul 18, 2022
  
  b3bc8ba6 Browse Files
- Merge branch 'feature/订单推送改造' into qa · 59decf26
  查志伟 committed Jul 18, 2022
  
  59decf26 Browse Files
- 订单推送开放平台配置由sdk实现 · da089351
  查志伟 committed Jul 18, 2022
  
  da089351 Browse Files
15 Jul, 2022 6 commits
- Merge branch 'KA-订单MQ功能迁移-zxh' into qa · 0b08d8f4
```
# Conflicts:
#	call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java
```
  周晓航 committed Jul 15, 2022
  0b08d8f4 Browse Files
- 对接光兴外部接口 · 182781f6
  周晓航 committed Jul 15, 2022
  
  182781f6 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 4b8b456f
  查志伟 committed Jul 15, 2022
  
  4b8b456f Browse Files
- Merge remote-tracking branch 'origin/feature/订单推送改造' into qa · 5e2bac13
  查志伟 committed Jul 15, 2022
  
  5e2bac13 Browse Files
- 订单聚合中台CallBack服务订单消息分发合并优化 · d543d861
  周晓航 committed Jul 15, 2022
  
  d543d861 Browse Files
- 对接敬轩需求 · 20c08022
  周晓航 committed Jul 15, 2022
  
  20c08022 Browse Files