Commits · 86dbe3774d17e859c1cdb979c4c92d09bbe42cf7 · order-group-application / order-group

25 May, 2022 1 commit

Merge branch 'master' into pre · 86dbe377

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

committed May 25, 2022

86dbe377 Browse Files

17 May, 2022 11 commits
- merge 冲突 · 455bd194
  查志伟 committed May 17, 2022
  
  455bd194 Browse Files
- merge 冲突 · 4d95f86e
  查志伟 committed May 17, 2022
  
  4d95f86e Browse Files
- Merge branch 'feature/v1.0.14' · 19266151
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  查志伟 committed May 17, 2022
  19266151 Browse Files
- 去除无用代码 · af02d7dd
  查志伟 committed May 17, 2022
  
  af02d7dd Browse Files
- oms feign日志增加打印 · a57cb197
  查志伟 committed May 17, 2022
  
  a57cb197 Browse Files
- oms feign日志增加打印 · af7b8d9a
  查志伟 committed May 17, 2022
  
  af7b8d9a Browse Files
- Merge branch 'feature/支付门店查询过滤无效数据/zhiwei.zha' · d3a83303
  查志伟 committed May 17, 2022
  
  d3a83303 Browse Files
- Merge branch 'feature/v1.0.14' · 015ed69a
  查志伟 committed May 17, 2022
  
  015ed69a Browse Files
- 未接单代付退款支持 · fd36156a
  查志伟 committed May 17, 2022
  
  fd36156a Browse Files
- Merge branch 'feature/v1.0.14' · 7861350a
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java
```
  查志伟 committed May 17, 2022
  7861350a Browse Files
- Merge branch 'feature/v1.0.14' into pre · 27cc2377
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  周晓航 committed May 17, 2022
  27cc2377 Browse Files
16 May, 2022 1 commit
- 添加一个main方法测试 · 2038741f
  周晓航 committed May 16, 2022
  
  2038741f Browse Files
13 May, 2022 4 commits
- 代码退款修改调用校验 · f9b84eba
  周晓航 committed May 13, 2022
  
  f9b84eba Browse Files
- 代码退款新增参数 · ddb1a021
  周晓航 committed May 13, 2022
  
  ddb1a021 Browse Files
- 代码退款新增参数 · eb0fa411
  周晓航 committed May 13, 2022
  
  eb0fa411 Browse Files
- 代码退款日志 · 7f6b4094
  周晓航 committed May 13, 2022
  
  7f6b4094 Browse Files
10 May, 2022 1 commit
- Merge branch 'release-门店拒绝的抖音核销ID1045995-20220421-zxh' into 'master' · 2090312c
```
Release 门店拒绝的抖音核销id1045995 20220421 zxh

See merge request !138
```
  缪晖 committed May 10, 2022
  2090312c Browse Files
07 May, 2022 2 commits
- Merge branch 'KA-小程序展示抖音订单' into pre · 9f33dca2
  周晓航 committed May 07, 2022
  
  9f33dca2 Browse Files
- 订单列表展示小助手订单 · 0e5959b7
  周晓航 committed May 07, 2022
  
  0e5959b7 Browse Files
05 May, 2022 2 commits
- Merge remote-tracking branch 'remotes/origin/bugfix/多卡支付余额为0支付方式错误' into pre · 1d977c96
  胡敬轩 committed May 05, 2022
  
  1d977c96 Browse Files
- 多卡支付余额为0支付方式错误 · aa617b26
  胡敬轩 committed May 05, 2022
  
  aa617b26 Browse Files
04 May, 2022 2 commits
- Merge remote-tracking branch 'remotes/origin/bugfix/多卡支付余额为0支付方式错误' into pre · 51c1eaba
  胡敬轩 committed May 04, 2022
  
  51c1eaba Browse Files
- 多卡支付余额为0支付方式错误 · 2adf13e8
  胡敬轩 committed May 04, 2022
  
  2adf13e8 Browse Files
30 Apr, 2022 7 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
- 仅支持餐饮订单操作该接口 · 37554da8
  周晓航 committed Apr 30, 2022
  
  37554da8 Browse Files
- 修改成批量操作 · 81d21bf1
  周晓航 committed Apr 30, 2022
  
  81d21bf1 Browse Files
- 修改成批量操作 · dd965948
  周晓航 committed Apr 30, 2022
  
  dd965948 Browse Files
- 新增不对外暴露接口操作退款 · 7ad343d8
  周晓航 committed Apr 30, 2022
  
  7ad343d8 Browse Files
29 Apr, 2022 2 commits
- 代付退款支持 · 03ee35eb
  查志伟 committed Apr 29, 2022
  
  03ee35eb 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 2 commits
- v1.0.14 change · 8ed39cbe
  查志伟 committed Apr 26, 2022
  
  8ed39cbe Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/Ka2.0.76-0427-0504-多卡支付' into pre · 5abeff53
  胡敬轩 committed Apr 26, 2022
  
  5abeff53 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 1 commit
- Merge remote-tracking branch 'remotes/origin/feature/Ka2.0.74-0413-0421-分账券' into pre · 9f2f334a
  胡敬轩 committed Apr 22, 2022
  
  9f2f334a Browse Files