提交 · 94fc770cab32025021d36372210c16bea546f97f · 姜武杰 / clx-performance

20 12月, 2023 9 次提交
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 94fc770c
  由 huyufan 提交于 12月 20, 2023
```
Former-commit-id: bddc5221
```
  94fc770c
- 更改字段对应 · 41c8989f
  由 huyufan 提交于 12月 20, 2023
  
  41c8989f
- 网络货运司机账户相关 · 074dd66d
  由 huyufan 提交于 12月 20, 2023
  
  074dd66d
- commit · 8b15df72
  由 liuhaiquan 提交于 12月 20, 2023
```
Former-commit-id: 710fbd40
```
  8b15df72
- Merge remote-tracking branch 'origin/test' into test · efd7da7b
  由 liuhaiquan 提交于 12月 20, 2023
```
Former-commit-id: fd991f28
```
  efd7da7b
- Merge remote-tracking branch 'origin/v7.6_small_version_fix_20231204' into test · 58bc0894
  由 liuhaiquan 提交于 12月 20, 2023
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqHandlerServiceImpl.java


Former-commit-id: d8d2ff21
```
  58bc0894
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · dd355890
  由 huyufan 提交于 12月 20, 2023
```
Former-commit-id: 157c665e
```
  dd355890
- 同步结算单 · 9072e08d
  由 huyufan 提交于 12月 20, 2023
  
  9072e08d
- 网络货运钱包相关 · 5071d597
  由 huyufan 提交于 12月 20, 2023
  
  5071d597
19 12月, 2023 19 次提交
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 66b5f8bb
  由 huyufan 提交于 12月 19, 2023
```
Former-commit-id: c4d6badf
```
  66b5f8bb
- 去除扣除金额 · 8bd24596
  由 huyufan 提交于 12月 19, 2023
  
  8bd24596
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 74cf1712
  由 huyufan 提交于 12月 19, 2023
```
Former-commit-id: 5e2f04e3
```
  74cf1712
- 增加扣除金额 · 121090e1
  由 huyufan 提交于 12月 19, 2023
  
  121090e1
- Merge remote-tracking branch 'origin/v7.6_small_version_fix_20231204' into test · 1c88ea30
  由 liuhaiquan 提交于 12月 19, 2023
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqHandlerServiceImpl.java


Former-commit-id: b69d69ba
```
  1c88ea30
- 车主结算单和违约车主结算单增加支付锁 · c6e1262d
  由 liuhaiquan 提交于 12月 19, 2023
  
  c6e1262d
- Merge remote-tracking branch 'origin/v7.6_small_version_fix_20231204' into test · 4d6f8d27
  由 liuhaiquan 提交于 12月 19, 2023
```
Former-commit-id: 5a2c9596
```
  4d6f8d27
- 去掉车主结算单和违约结算单的异常抛出 · df58d0b9
  由 liuhaiquan 提交于 12月 19, 2023
  
  df58d0b9
- Merge remote-tracking branch 'origin/v7.6_small_version_fix_20231204' into test · 2002080c
  由 liuhaiquan 提交于 12月 19, 2023
```
Former-commit-id: 9d9496b8
```
  2002080c
- 车主结算单增加支付失败字段 · 7d56d599
  由 liuhaiquan 提交于 12月 19, 2023
  
  7d56d599
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · c5bf934d
  由 huyufan 提交于 12月 19, 2023
```
Former-commit-id: bb967201
```
  c5bf934d
- 结算单 · a6a3896f
  由 huyufan 提交于 12月 19, 2023
  
  a6a3896f
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · ea869f2c
  由 huyufan 提交于 12月 19, 2023
```
Former-commit-id: 2702d603
```
  ea869f2c
- 结算单 · 2987677d
  由 huyufan 提交于 12月 19, 2023
  
  2987677d
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 5be4e1eb
  由 huyufan 提交于 12月 19, 2023
```
Former-commit-id: 3a8ef2f0
```
  5be4e1eb
- 结算单 · 7fe202f3
  由 huyufan 提交于 12月 19, 2023
  
  7fe202f3
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 00365a00
  由 huyufan 提交于 12月 19, 2023
```
Former-commit-id: 270209c7
```
  00365a00
- 修改BUG · afe0081a
  由 huyufan 提交于 12月 19, 2023
  
  afe0081a
- Merge remote-tracking branch 'origin/v7.9_small_version_fix_20231213' into test · 7d169b9e
  由 liuhaiquan 提交于 12月 19, 2023
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderCancelServiceImpl.java


Former-commit-id: 8de28d44
```
  7d169b9e
18 12月, 2023 12 次提交
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 12a5a953
  由 huyufan 提交于 12月 18, 2023
```
Former-commit-id: 53eba94f
```
  12a5a953
- 查询当前订单号是否已经生成货主结算单明细 · 5ac139c3
  由 huyufan 提交于 12月 18, 2023
  
  5ac139c3
- 货单编辑增加不为0的限制 · cbff55b4
  由 liuhaiquan 提交于 12月 18, 2023
  
  cbff55b4
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · bedc9cc0
  由 huyufan 提交于 12月 18, 2023
```
Former-commit-id: 18fab4ea
```
  bedc9cc0
- 查询当前订单号是否已经生成货主结算单明细 · 5101136e
  由 huyufan 提交于 12月 18, 2023
  
  5101136e
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 0b9e1c23
  由 huyufan 提交于 12月 18, 2023
```
Former-commit-id: 7cc670ad
```
  0b9e1c23
- 查询当前订单号是否已经生成货主结算单明细 · 760a1392
  由 huyufan 提交于 12月 18, 2023
  
  760a1392
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 63b8ba75
  由 huyufan 提交于 12月 18, 2023
```
Former-commit-id: 8f377490
```
  63b8ba75
- 预付运费计算逻辑变更 · 39220ba2
  由 huyufan 提交于 12月 18, 2023
  
  39220ba2
- 承运同步-查询风控状态 · db345305
  由 aiqingguo 提交于 12月 18, 2023
  
  db345305
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 342ca004
  由 huyufan 提交于 12月 18, 2023
```
Former-commit-id: 152005dd
```
  342ca004
- 预付运费计算逻辑变更 · 03e92e84
  由 huyufan 提交于 12月 18, 2023
  
  03e92e84