From a70433b2ee5bb37823ab73422a01251343cb5f58 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 九月 2026 17:55:50 +0800
Subject: [PATCH] 修改订单业务流程和其他功能修改
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/VinManagementClient.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/VinManagementClient.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/VinManagementClient.java
index 387c134..41d244a 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/VinManagementClient.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/VinManagementClient.java
@@ -50,6 +50,12 @@
R<List<TVinManagement>> listByCompany(@RequestParam("companyId") Integer companyId);
/**
+ * 按车队统计未删除的VIN车辆数（车队管理-列表"VIN码车辆数"使用）
+ */
+ @GetMapping("/t-vin-management/inner/count-by-fleet")
+ R<Long> countByFleet(@RequestParam("fleetId") Integer fleetId);
+
+ /**
* 锁定VIN余额（VIN码充电申请，分配模式，按「余额-锁定金额」条件更新，余额不足返回失败；返回锁定后剩余可用金额）
*/
@PostMapping("/t-vin-management/inner/lock-balance")
@@ -57,11 +63,16 @@
/**
* 结算VIN余额（解锁锁定额并按实际消费扣减，允许扣成负数；返回扣减后余额）
+ * <p>订单号非空时按订单号幂等（同事务写消费流水），补偿重试不会重复结算</p>
*/
@PostMapping("/t-vin-management/inner/settle-balance")
R<BigDecimal> settleBalance(@RequestParam("vinId") Long vinId,
@RequestParam("lockedAmount") BigDecimal lockedAmount,
- @RequestParam("actualAmount") BigDecimal actualAmount);
+ @RequestParam("actualAmount") BigDecimal actualAmount,
+ @RequestParam(value = "orderCode", required = false) String orderCode,
+ @RequestParam(value = "userInfo", required = false) String userInfo,
+ @RequestParam(value = "userName", required = false) String userName,
+ @RequestParam(value = "remark", required = false) String remark);
/**
* 释放VIN锁定金额（未产生消费时使用，返回释放后余额）
--
Gitblit v1.7.1