Commits · 2fdca05a9676e8815bfa8c63b361e43c1e10011f · order-group-application / order-group · GitLab

07 May, 2022 2 commits
- Merge branch 'KA-小程序展示抖音订单' into qa · 2fdca05a
  周晓航 committed May 07, 2022
  
  2fdca05a Browse Files
- 订单列表展示小助手订单 · 0e5959b7
  周晓航 committed May 07, 2022
  
  0e5959b7 Browse Files
05 May, 2022 3 commits
- Merge remote-tracking branch 'remotes/origin/bugfix/多卡支付余额为0支付方式错误' into qa · 095d034f
  胡敬轩 committed May 05, 2022
  
  095d034f Browse Files
- 多卡支付余额为0支付方式错误 · aa617b26
  胡敬轩 committed May 05, 2022
  
  aa617b26 Browse Files
- Merge remote-tracking branch 'remotes/origin/bugfix/多卡支付余额为0支付方式错误' into qa · 9e34ca73
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  胡敬轩 committed May 05, 2022
  9e34ca73 Browse Files
04 May, 2022 1 commit
- 多卡支付余额为0支付方式错误 · 2adf13e8
  胡敬轩 committed May 04, 2022
  
  2adf13e8 Browse Files
30 Apr, 2022 11 commits
- Merge branch 'KA-接口调用订单退款' into 'master' · 1c5b1c5a
```
仅支持 餐饮订单操作该接口

See merge request !137
```
  缪晖 committed May 01, 2022
  1c5b1c5a Browse Files
- 仅支持餐饮订单操作该接口 · 6e09aff0
  周晓航 committed May 01, 2022
  
  6e09aff0 Browse Files
- Merge branch 'KA-接口调用订单退款' into 'master' · 556e2e89
```
Ka 接口调用订单退款

See merge request !136
```
  缪晖 committed Apr 30, 2022
  556e2e89 Browse Files
- Merge branch 'KA-接口调用订单退款' into qa · 37296fe0
  周晓航 committed Apr 30, 2022
  
  37296fe0 Browse Files
- 仅支持餐饮订单操作该接口 · 37554da8
  周晓航 committed Apr 30, 2022
  
  37554da8 Browse Files
- Merge branch 'KA-接口调用订单退款' into qa · e0e2dad5
  周晓航 committed Apr 30, 2022
  
  e0e2dad5 Browse Files
- 修改成批量操作 · 81d21bf1
  周晓航 committed Apr 30, 2022
  
  81d21bf1 Browse Files
- Merge branch 'KA-接口调用订单退款' into qa · 087a04ce
  周晓航 committed Apr 30, 2022
  
  087a04ce Browse Files
- 修改成批量操作 · dd965948
  周晓航 committed Apr 30, 2022
  
  dd965948 Browse Files
- Merge branch 'KA-接口调用订单退款' into qa · e63c091d
  周晓航 committed Apr 30, 2022
  
  e63c091d Browse Files
- 新增不对外暴露接口操作退款 · 7ad343d8
  周晓航 committed Apr 30, 2022
  
  7ad343d8 Browse Files
29 Apr, 2022 4 commits
- Merge branch 'feature/v1.0.14' into qa · cdea4d87
  查志伟 committed Apr 29, 2022
  
  cdea4d87 Browse Files
- 代付退款支持 · 03ee35eb
  查志伟 committed Apr 29, 2022
  
  03ee35eb Browse Files
- Merge branch 'feature/v1.0.14' into qa · bfe3d675
  查志伟 committed Apr 29, 2022
  
  bfe3d675 Browse Files
- 代付退款支持 · e0c68566
  查志伟 committed Apr 29, 2022
  
  e0c68566 Browse Files
28 Apr, 2022 1 commit
- Merge remote-tracking branch 'remotes/origin/feature/Ka2.0.76-0427-0504-多卡支付' · 3e18580c
  胡敬轩 committed Apr 28, 2022
  
  3e18580c Browse Files
27 Apr, 2022 2 commits
- fix circular reference · e4f15ceb
  查志伟 committed Apr 27, 2022
  
  e4f15ceb Browse Files
- v1.0.14 change · 5fda6964
  查志伟 committed Apr 27, 2022
  
  5fda6964 Browse Files
26 Apr, 2022 1 commit
- v1.0.14 change · 8ed39cbe
  查志伟 committed Apr 26, 2022
  
  8ed39cbe Browse Files
25 Apr, 2022 1 commit
- Merge remote-tracking branch 'remotes/origin/feature/Ka2.0.74-0413-0421-分账券' · f4a1a80f
  胡敬轩 committed Apr 25, 2022
  
  f4a1a80f Browse Files
22 Apr, 2022 2 commits
- Merge branch 'temp-新增日志' into qa · 9706d172
  周晓航 committed Apr 22, 2022
  
  9706d172 Browse Files
- 新增一段日志 · 9d8bc6c2
  周晓航 committed Apr 22, 2022
  
  9d8bc6c2 Browse Files
21 Apr, 2022 2 commits
- Merge remote-tracking branch 'remotes/origin/feature/Ka2.0.76-0427-0504-多卡支付' into qa · c11d4b71
  胡敬轩 committed Apr 21, 2022
  
  c11d4b71 Browse Files
- 删除不需要的代码查志伟 · 18abe8a8
  胡敬轩 committed Apr 21, 2022
  
  18abe8a8 Browse Files
20 Apr, 2022 6 commits
- Merge remote-tracking branch 'remotes/origin/feature/Ka2.0.74-0413-0421-分账券'… · cf731730
```
Merge remote-tracking branch 'remotes/origin/feature/Ka2.0.74-0413-0421-分账券' into feature/Ka2.0.76-0427-0504-多卡支付
```
  胡敬轩 committed Apr 20, 2022
  cf731730 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/Ka2.0.74-0413-0421-分账券' into qa · 5700d828
  胡敬轩 committed Apr 20, 2022
  
  5700d828 Browse Files
- 支付回调svc流水字段payItems · 358d520d
  胡敬轩 committed Apr 20, 2022
  
  358d520d Browse Files
- Merge branch 'feature/支付门店查询过滤无效数据/zhiwei.zha' into qa · 4de12e39
  查志伟 committed Apr 20, 2022
  
  4de12e39 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/Ka2.0.76-0427-0504-多卡支付' into qa · 210b7689
  胡敬轩 committed Apr 20, 2022
  
  210b7689 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/Ka2.0.74-0413-0421-分账券' into qa · e65a77d6
  胡敬轩 committed Apr 20, 2022
  
  e65a77d6 Browse Files
19 Apr, 2022 1 commit
- bug fix 赠品下单属性不匹配问题 · 6764c28b
  查志伟 committed Apr 19, 2022
  
  6764c28b Browse Files
18 Apr, 2022 1 commit
- 多储值卡支付 listCartGoodsCheck接口改造 · 29df11f9
  胡敬轩 committed Apr 18, 2022
  
  29df11f9 Browse Files
17 Apr, 2022 1 commit
- bug fix 赠品下单属性不匹配问题 · 39c32f72
  查志伟 committed Apr 17, 2022
  
  39c32f72 Browse Files
13 Apr, 2022 1 commit
- 多储值卡支付创建预支付改成支付新接口整个流程增加多卡字段cardCodes · cc28149a
  胡敬轩 committed Apr 13, 2022
  
  cc28149a Browse Files