From 0ca3a3922d2d25df52682b2290be15135cce100e Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期二, 29 九月 2026 17:56:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.3' into 2.3
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/VinManagementFallbackFactory.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/VinManagementFallbackFactory.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/VinManagementFallbackFactory.java
index f43a624..b02087a 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/VinManagementFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/VinManagementFallbackFactory.java
@@ -50,12 +50,18 @@
}
@Override
+ public R<Long> countByFleet(Integer fleetId) {
+ return R.fail("按车队统计VIN车辆数失败:" + throwable.getMessage());
+ }
+
+ @Override
public R<BigDecimal> lockBalance(Long vinId, BigDecimal amount) {
return R.fail("锁定VIN余额失败:" + throwable.getMessage());
}
@Override
- public R<BigDecimal> settleBalance(Long vinId, BigDecimal lockedAmount, BigDecimal actualAmount) {
+ public R<BigDecimal> settleBalance(Long vinId, BigDecimal lockedAmount, BigDecimal actualAmount,
+ String orderCode, String userInfo, String userName, String remark) {
return R.fail("结算VIN余额失败:" + throwable.getMessage());
}
--
Gitblit v1.7.1