From 7617d46abee2950b7336e3379f8c7a564939cb54 Mon Sep 17 00:00:00 2001
From: yanderong <307678080@qq.com>
Date: 星期六, 10 十月 2026 17:54:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.3' into 2.3
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
index 1f09cd7..d762d88 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
@@ -373,4 +373,14 @@
*/
@PostMapping("/t-charging-order/inner/device-start-charging")
R<DeviceStartChargingVO> deviceStartCharging(@RequestBody DeviceStartChargingDTO dto);
+
+ /**
+ * 统计公司名下进行中的充电订单数（三表合计，状态 2=启动中/3=充电中/4=停止中，
+ * 账户模式切换：分配→共享 前校验使用）
+ *
+ * @param companyId 所属公司ID
+ * @return 进行中订单数
+ */
+ @PostMapping("/t-charging-order/inner/count-active-by-company")
+ R<Integer> countActiveByCompany(@RequestParam("companyId") Integer companyId);
}
--
Gitblit v1.7.1