From 3650ce7f5d42d1bef58abea9693f20d1f209d3b0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 10 十月 2026 14:02:27 +0800
Subject: [PATCH] 修改bug
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/CompanyAllocateRecordClient.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/CompanyAllocateRecordClient.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/CompanyAllocateRecordClient.java
index 72239b8..80b6af4 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/CompanyAllocateRecordClient.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/CompanyAllocateRecordClient.java
@@ -1,6 +1,7 @@
package com.ruoyi.account.api.feignClient;
import com.ruoyi.account.api.factory.CompanyAllocateRecordFallbackFactory;
+import com.ruoyi.account.api.vo.CompanyAllocateSummaryVO;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import org.springframework.cloud.openfeign.FeignClient;
@@ -51,4 +52,29 @@
*/
@PostMapping("/company-allocate-record/inner/list-consumed-order-codes")
R<List<String>> listConsumedOrderCodes(@RequestBody List<String> orderCodes);
- }
+
+ /**
+ * 统计公司名下三类主体（VIN码/刷卡/白名单手机号）可用余额与充电锁定金额合计（只读，
+ * 分配模式切换为共享模式前的校验使用）。
+ *
+ * @param companyId 所属公司ID
+ */
+ @PostMapping("/company-allocate-record/inner/sum-allocated-balance")
+ R<CompanyAllocateSummaryVO> sumAllocatedBalance(@RequestParam("companyId") Integer companyId);
+
+ /**
+ * 回收公司名下三类主体全部分配余额至公司账户（分配模式切换为共享模式时调用）。
+ * 幂等：余额已清零的主体不重复回收、不重复写流水；返回本次实际回收总额。
+ *
+ * @param companyId 所属公司ID
+ * @param operatorName 操作人账号
+ * @param companyName 公司名称（企业账户流水 userInfo 使用，可为空）
+ * @param companyBalanceBefore 回退前公司可用余额（企业账户正数流水 beforeBalance 使用）
+ * @return 本次实际回收总额（元，无余额时返回 0）
+ */
+ @PostMapping("/company-allocate-record/inner/recycle-allocated-balance")
+ R<BigDecimal> recycleAllocatedBalance(@RequestParam("companyId") Integer companyId,
+ @RequestParam("operatorName") String operatorName,
+ @RequestParam(value = "companyName", required = false) String companyName,
+ @RequestParam("companyBalanceBefore") BigDecimal companyBalanceBefore);
+}
--
Gitblit v1.7.1