提交 · c751c56d5c246a0b5908009348a0229396b55538 · 姜武杰 / clx-performance

03 1月, 2024 14 次提交

Merge branch 'v9.6_network_small_version_20240102' into test · c751c56d

由提交于 1月 03, 2024

# Conflicts:
#	performance-web/src/main/java/com/clx/performance/controller/temp/TempController.java


Former-commit-id: d846e591

c751c56d

承运同步-参数、返回值使用对象 · b15abb23
由 aiqingguo 提交于 1月 03, 2024

b15abb23
Merge remote-tracking branch 'origin/test' into test · 2773ecb1
由 liuhaiquan 提交于 1月 03, 2024
```
Former-commit-id: 4ca7b595
```
2773ecb1
Merge remote-tracking branch 'origin/v8.6_small_version_fix_20231218' into test · 61402342
由 liuhaiquan 提交于 1月 03, 2024
```
Former-commit-id: dcd7243d
```
61402342
修改自由车辆取消运单违约金额计算的问题 · 3d8e2128
由 liuhaiquan 提交于 1月 03, 2024

3d8e2128
承运同步-查询风控状态 · 6bbc37ac
由 aiqingguo 提交于 1月 03, 2024
```
Former-commit-id: df6a90d2
```
6bbc37ac
承运同步-查询风控状态 · 026962a8
由 aiqingguo 提交于 1月 03, 2024

026962a8
Merge remote-tracking branch 'origin/v8.6_small_version_fix_20231218' into test · 9df3bf6a
由 liuhaiquan 提交于 1月 03, 2024
```
Former-commit-id: 3ac5b34e
```
9df3bf6a
修改合并后的结算单订单号为空 · 53970611
由 liuhaiquan 提交于 1月 03, 2024

53970611
承运同步网络货运异步 · 04ee3a32
由 huyufan 提交于 1月 03, 2024

04ee3a32

Merge remote-tracking branch 'origin/test' into test · 4661fe5a

由提交于 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/OwnerAccountServiceImpl.java


Former-commit-id: de70b291

4661fe5a

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 5 次提交

Merge remote-tracking branch 'origin/v9.6_network_small_version_20240102' into test · 2fad0402
由 huyufan 提交于 1月 02, 2024
```
Former-commit-id: 8163cc54
```
2fad0402
PC 车主计费展示预付标识 · cf638cf8
由 huyufan 提交于 1月 02, 2024

cf638cf8

Merge remote-tracking branch 'origin/v9.6_network_small_version_20240102' into test · 89e8085a

由提交于 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


Former-commit-id: 3f7c55dc

89e8085a

网络货运司机APP钱包流水展示 · 0fb522a5
由 huyufan 提交于 1月 02, 2024

0fb522a5

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 15 次提交
- 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