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

26 Jul, 2022 6 commits
- Merge branch 'feature/20220726_提供公共支付查询接口_wuping' of… · d4fc579e
```
Merge branch 'feature/20220726_提供公共支付查询接口_wuping' of https://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Jul 26, 2022
  d4fc579e Browse Files
- 支付结果查询mq-(会员，点餐下单公共),死信队列 · c89b7f02
  ping.wu committed Jul 26, 2022
  
  c89b7f02 Browse Files
- Merge branch 'KA-华莱士抽奖跳转百世新增接口' into develop · 7ccc38e8
  周晓航 committed Jul 26, 2022
  
  7ccc38e8 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 develop · 30743658
  周晓航 committed Jul 26, 2022
  
  30743658 Browse Files
22 Jul, 2022 4 commits
- 维护给前端弹框字段 · a15ebe1d
  周晓航 committed Jul 22, 2022
  
  a15ebe1d Browse Files
- Merge branch 'KA-华莱士抽奖跳转百世新增接口' into develop · 81dc11ed
  周晓航 committed Jul 22, 2022
  
  81dc11ed 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 develop · d05a86d7
  周晓航 committed Jul 21, 2022
  
  d05a86d7 Browse Files
- 新增响应日志, 方便生产查问题 · 214c45a1
  周晓航 committed Jul 21, 2022
  
  214c45a1 Browse Files
- Merge branch 'KA-华莱士抽奖跳转百世新增接口' into develop · c4901fc9
  周晓航 committed Jul 21, 2022
  
  c4901fc9 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 develop · 3dccec8c
  周晓航 committed Jul 21, 2022
  
  3dccec8c Browse Files
- 华莱士的百事抽奖新增订单类型校验 · 8fed97e7
  周晓航 committed Jul 21, 2022
  
  8fed97e7 Browse Files
20 Jul, 2022 4 commits
- Merge branch 'feature/订单推送改造' into develop · 10ace0ef
  查志伟 committed Jul 20, 2022
  
  10ace0ef Browse Files
- 订单推送入参增加门店号 · c77e5d0f
  查志伟 committed Jul 20, 2022
  
  c77e5d0f Browse Files
- Merge branch 'KA-华莱士抽奖跳转百世新增接口' into develop · 5032ec69
  周晓航 committed Jul 20, 2022
  
  5032ec69 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 develop · 59ca2bd2
  周晓航 committed Jul 19, 2022
  
  59ca2bd2 Browse Files
- 对接光兴外部接口 · f65ec39c
  周晓航 committed Jul 19, 2022
  
  f65ec39c Browse Files
- Merge branch 'KA-华莱士抽奖跳转百世新增接口' into develop · 2726e381
  周晓航 committed Jul 19, 2022
  
  2726e381 Browse Files
18 Jul, 2022 3 commits
- 去掉邮件告警 · b3bc8ba6
  查志伟 committed Jul 18, 2022
  
  b3bc8ba6 Browse Files
- Merge branch 'feature/订单推送改造' into develop · d9254580
  查志伟 committed Jul 18, 2022
  
  d9254580 Browse Files
- 订单推送开放平台配置由sdk实现 · da089351
  查志伟 committed Jul 18, 2022
  
  da089351 Browse Files
15 Jul, 2022 8 commits
- Merge branch 'KA-订单MQ功能迁移-zxh' into develop · fbe189d3
```
# Conflicts:
#	call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java
```
  周晓航 committed Jul 15, 2022
  fbe189d3 Browse Files
- 对接光兴外部接口 · 182781f6
  周晓航 committed Jul 15, 2022
  
  182781f6 Browse Files
- 订单聚合中台CallBack服务订单消息分发合并优化 · d543d861
  周晓航 committed Jul 15, 2022
  
  d543d861 Browse Files
- 对接敬轩需求 · 20c08022
  周晓航 committed Jul 15, 2022
  
  20c08022 Browse Files
- 华莱士&百事抽奖活动判断订单金额和商品是否满足活动 · f0bbc2e2
  胡敬轩 committed Jul 15, 2022
  
  f0bbc2e2 Browse Files
- 【华莱士】华莱士&百事抽奖活动新增接口,是否告知前端需要弹框 · 4e11a9aa
  周晓航 committed Jul 15, 2022
  
  4e11a9aa Browse Files
- 【华莱士】华莱士&百事抽奖活动新增接口,是否告知前端需要弹框 · ba652c5c
  周晓航 committed Jul 15, 2022
  
  ba652c5c Browse Files
- 暂时提交代码,开发紧急需求 · c726832c
```
已对接:
/order/v2/cancel
/order/v2/cancelPortion
```
  周晓航 committed Jul 15, 2022
  c726832c Browse Files
13 Jul, 2022 2 commits
- Merge branch 'KA-技术优化-支付成功回调处理订单已取消的场景' · 578345cf
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  周晓航 committed Jul 13, 2022
  578345cf Browse Files
- 移除测试代码 · 9cd6175c
  周晓航 committed Jul 13, 2022
  
  9cd6175c Browse Files