Commits · 06a9839103176be0510467f509a4c45e26968e98 · order-group-application / order-group

26 Jul, 2022 3 commits
- Merge branch 'KA-华莱士抽奖跳转百世新增接口' into qa · 06a98391
  周晓航 committed Jul 26, 2022
  
  06a98391 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 6 commits
- 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 '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 3 commits
- 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 2 commits
- 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 10 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
- 华莱士&百事抽奖活动判断订单金额和商品是否满足活动 · 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 3 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
- Merge branch 'KA-技术优化-支付成功回调处理订单已取消的场景' into qa · 4ba4873c
  周晓航 committed Jul 13, 2022
  
  4ba4873c Browse Files
- 移除测试代码 · 9cd6175c
  周晓航 committed Jul 13, 2022
  
  9cd6175c Browse Files
11 Jul, 2022 2 commits
- Merge branch 'ka-促销需要商品券的spuid' into qa · 2cbefd74
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java
```
  周晓航 committed Jul 11, 2022
  2cbefd74 Browse Files
- 技术优化,商品券数据维护spuid字段给促销 · 80e8015a
  周晓航 committed Jul 11, 2022
  
  80e8015a Browse Files
07 Jul, 2022 2 commits
- Merge branch 'KA-技术优化-支付成功回调处理订单已取消的场景' into qa · e34b4f8c
  周晓航 committed Jul 07, 2022
  
  e34b4f8c Browse Files
- 技术优化支付成功睡眠三秒再执行 · 594cb202
  周晓航 committed Jul 07, 2022
  
  594cb202 Browse Files
05 Jul, 2022 1 commit

Merge branches 'feature/20220622_退款失败记录到订单_wuping' and 'master' of… · 51b3d5ee

Merge branches 'feature/20220622_退款失败记录到订单_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java
#	order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java

committed Jul 05, 2022

51b3d5ee Browse Files