From 010b1028b7121ae37d76441af1df7a2d9f698fc5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 九月 2026 11:30:44 +0800
Subject: [PATCH] 修改bug和修改VIN充电流程
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/GroupCompanyClient.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/GroupCompanyClient.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/GroupCompanyClient.java
index 360cbbb..edac8a7 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/GroupCompanyClient.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/GroupCompanyClient.java
@@ -47,6 +47,26 @@
R<BigDecimal> refundBalance(@RequestParam("companyId") Integer companyId, @RequestParam("amount") BigDecimal amount);
/**
+ * 锁定公司金额（VIN码充电申请，按「可用余额-锁定金额」条件更新，余额不足返回失败；返回锁定后剩余可用金额）
+ */
+ @PostMapping("/group-company/remote/lock-balance")
+ R<BigDecimal> lockBalance(@RequestParam("companyId") Integer companyId, @RequestParam("amount") BigDecimal amount);
+
+ /**
+ * 结算公司金额（解锁锁定额并按实际消费扣减，允许扣成负数；返回扣减后余额）
+ */
+ @PostMapping("/group-company/remote/settle-balance")
+ R<BigDecimal> settleBalance(@RequestParam("companyId") Integer companyId,
+ @RequestParam("lockedAmount") BigDecimal lockedAmount,
+ @RequestParam("actualAmount") BigDecimal actualAmount);
+
+ /**
+ * 释放公司锁定金额（未产生消费时使用，返回释放后余额）
+ */
+ @PostMapping("/group-company/remote/unlock-balance")
+ R<BigDecimal> unlockBalance(@RequestParam("companyId") Integer companyId, @RequestParam("amount") BigDecimal amount);
+
+ /**
* 查询车队详情
*/
@PostMapping("/fleet/remote/get/{id}")
--
Gitblit v1.7.1