提交 · 16a2439fd641b805cfcf06f4e98d718ada84b5e2 · 姜武杰 / clx-performance

03 1月, 2024 3 次提交

Merge remote-tracking branch 'origin/v8.6_small_version_fix_20231218' into test · 16a2439f

由提交于 1月 03, 2024

# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderCancelServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqHandlerServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerServiceImpl.java


Former-commit-id: e97153c1

16a2439f

修改结算单相关问题 · 42576ac2
由 liuhaiquan 提交于 1月 03, 2024

42576ac2

Merge remote-tracking branch 'origin/master' into v8.6_small_version_fix_20231218 · 1f2943dc

由提交于 1月 03, 2024

# Conflicts:
#	performance-web/src/main/java/com/clx/performance/dao/settle/SettlementOwnerDetailDao.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/settle/SettlementMqHandlerService.java
#	performance-web/src/main/java/com/clx/performance/service/settle/SettlementOwnerService.java

1f2943dc

02 1月, 2024 1 次提交

Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' · c1e4b3a6

由提交于 1月 02, 2024

# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderCancelServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqHandlerServiceImpl.java

c1e4b3a6

26 12月, 2023 6 次提交
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · c1ffc5ae
  由 huyufan 提交于 12月 26, 2023
```
Former-commit-id: ded599e9
```
  c1ffc5ae
- 网络货运账户 · ea970f1b
  由 huyufan 提交于 12月 26, 2023
  
  ea970f1b
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 4278d3fa
  由 huyufan 提交于 12月 26, 2023
```
Former-commit-id: 68413ebd
```
  4278d3fa
- 网络货运账户 · 5f69eebc
  由 huyufan 提交于 12月 26, 2023
  
  5f69eebc
- Merge remote-tracking branch 'origin/bug_truck_integral_20231211' · d05d7daa
  由 liuhaiquan 提交于 12月 26, 2023
  
  d05d7daa
- Merge remote-tracking branch 'origin/v7.9_small_version_fix_20231213' · 74ad94ea
  由 liuhaiquan 提交于 12月 26, 2023
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java
```
  74ad94ea
25 12月, 2023 30 次提交
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 610df915
  由 huyufan 提交于 12月 25, 2023
```
Former-commit-id: 8100f02a
```
  610df915
- 网络货运账户 · 7e37b47b
  由 huyufan 提交于 12月 25, 2023
  
  7e37b47b
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 7397f245
  由 huyufan 提交于 12月 25, 2023
```
Former-commit-id: 6e675574
```
  7397f245
- 网络货运账户 · d7f9eb47
  由 huyufan 提交于 12月 25, 2023
  
  d7f9eb47
- Merge remote-tracking branch 'origin/master' into v7.9_small_version_fix_20231213 · 6f67d07c
  由 liuhaiquan 提交于 12月 25, 2023
  
  6f67d07c
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · aaf575c8
  由 huyufan 提交于 12月 25, 2023
```
Former-commit-id: 6fa47bab
```
  aaf575c8
- 网络货运账户 · aae3dca8
  由 huyufan 提交于 12月 25, 2023
  
  aae3dca8
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · c24b07a1
  由 huyufan 提交于 12月 25, 2023
```
Former-commit-id: ab353987
```
  c24b07a1
- 网络货运账户 · 82188db4
  由 huyufan 提交于 12月 25, 2023
  
  82188db4
- Merge remote-tracking branch 'origin/test' into test · 51f6d0e6
  由 huyufan 提交于 12月 25, 2023
```
Former-commit-id: 4565af13
```
  51f6d0e6
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 27507265
  由 huyufan 提交于 12月 25, 2023
```
Former-commit-id: e0d1bac8
```
  27507265
- 网络货运账户 · eb5d9b40
  由 huyufan 提交于 12月 25, 2023
  
  eb5d9b40
- Merge remote-tracking branch 'origin/v7.6_small_version_fix_20231204' into test · 7746dd61
  由 liuhaiquan 提交于 12月 25, 2023
```
Former-commit-id: ade81782
```
  7746dd61
- 修改结算单和违约结算单已结算的数据把结算失败原因置空 · a95a19d9
  由 liuhaiquan 提交于 12月 25, 2023
  
  a95a19d9
- Merge remote-tracking branch 'origin/test' into test · 76fdd7c0
  由 liuhaiquan 提交于 12月 25, 2023
```
Former-commit-id: 89fb5c7f
```
  76fdd7c0
- Merge remote-tracking branch 'origin/v7.6_small_version_fix_20231204' into test · 3ce369eb
  由 liuhaiquan 提交于 12月 25, 2023
```
Former-commit-id: d5ded27f
```
  3ce369eb
- 修改结算单和违约结算单已结算的数据把结算失败原因置空 · 93f48944
  由 liuhaiquan 提交于 12月 25, 2023
  
  93f48944
- Merge remote-tracking branch 'origin/test' into test · 5e5cf201
  由 huyufan 提交于 12月 25, 2023
```
Former-commit-id: 19a2c4eb
```
  5e5cf201
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 149e1960
  由 huyufan 提交于 12月 25, 2023
```
Former-commit-id: dc39007b
```
  149e1960
- 网络货运账户 · 92cdc126
  由 huyufan 提交于 12月 25, 2023
  
  92cdc126
- Merge remote-tracking branch 'origin/test' into test · 577f95f8
  由 liuhaiquan 提交于 12月 25, 2023
```
Former-commit-id: f7f4e378
```
  577f95f8
- Merge remote-tracking branch 'origin/v7.6_small_version_fix_20231204' into test · 0aa44d04
  由 liuhaiquan 提交于 12月 25, 2023
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/constant/RedissonConstants.java


Former-commit-id: 3ece4629
```
  0aa44d04
- 修改结算单和违约结算单已结算的数据把结算失败原因置空 · 1e79421b
  由 liuhaiquan 提交于 12月 25, 2023
  
  1e79421b
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 0fc6ce8a
  由 huyufan 提交于 12月 25, 2023
```
Former-commit-id: 467de535
```
  0fc6ce8a
- 网络货运账户 · 03a3a50c
  由 huyufan 提交于 12月 25, 2023
  
  03a3a50c
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 4b8a2e7f
  由 huyufan 提交于 12月 25, 2023
```
# Conflicts:
#	performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java
#	performance-web/src/main/java/com/clx/performance/component/OrderCancelComponent.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderCancelServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java
#	performance-web/src/test/java/com/clx/performance/JobTest.java


Former-commit-id: dba06d65
```
  4b8a2e7f
- 网络货运账户 · dcf9257b
  由 huyufan 提交于 12月 25, 2023
  
  dcf9257b
- 修改merge 错误 · d522be1f
  由 liuhaiquan 提交于 12月 25, 2023
  
  d522be1f
- Merge remote-tracking branch 'origin/master' into v6.5_transport_open_20231115 · 3d0450bb
  由 liuhaiquan 提交于 12月 25, 2023
```
# Conflicts:
#	performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderCancelServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java
#	performance-web/src/test/java/com/clx/performance/JobTest.java
```
  3d0450bb
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · a673f91a
  由 huyufan 提交于 12月 25, 2023
```
Former-commit-id: 2071fffb
```
  a673f91a