From 63b68c39653208a1756640034c028789946d0e12 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 13 十月 2026 15:47:20 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index 40ef089..a2002a6 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -1912,6 +1912,18 @@
})
public AjaxResult stopCharging(@PathVariable String id) {
log.info("小程序主动发起停止充电，订单ID：{}", id);
+ // VIN 码充电订单路由：VD 订单存于 t_vin_charging_order，不在 t_charging_order；
+ // VD 表存在该 ID 订单时优先走 VIN 停充（内部按状态返回准确的“不能重复操作/还未开始充电”），
+ // 其余情况回落普通停充。雪花 ID 两表同源生成，撞号概率可忽略
+ TVinChargingOrder vinOrder = null;
+ try {
+ vinOrder = vinChargingOrderService.getById(Long.valueOf(id));
+ } catch (NumberFormatException ignored) {
+ // 非数字订单ID，按普通停充处理
+ }
+ if (vinOrder != null) {
+ return vinChargingOrderService.stopChargingByApplet(id);
+ }
return chargingOrderService.stopCharging(id);
}
--
Gitblit v1.7.1