From e0f72812f2752914ed882d0512b848930036f12e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 02 九月 2026 17:19:21 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 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 02098dc..9b1d28c 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
@@ -1484,7 +1484,8 @@
         chargingOrderInfoVO.setCdVoltage(byId.getVoltage()!=null?byId.getVoltage().setScale(2, BigDecimal.ROUND_HALF_DOWN)+"":"");
         chargingOrderInfoVO.setSurplus(byId.getTotalElectricity()!=null?byId.getTotalElectricity().setScale(2, BigDecimal.ROUND_HALF_DOWN)+"":"");
         chargingOrderInfoVO.setTotalPower(byId.getPower()!=null?byId.getPower().setScale(2, BigDecimal.ROUND_HALF_DOWN)+"":"");
-        chargingOrderInfoVO.setVin(byId.getVin());
+        chargingOrderInfoVO.setVin(byId.getActualVin());
+        chargingOrderInfoVO.setActualVin(byId.getActualVin());
         if (byId.getAppUserCarId()!=null){
             TAppUserCar data = appUserCarClient.getCarById(byId.getAppUserCarId()+"").getData();
             if (data!=null){
@@ -2333,15 +2334,15 @@
         if (orderCode.startsWith("CD")) {
             updated = chargingOrderService.update(Wrappers.<TChargingOrder>lambdaUpdate()
                     .eq(TChargingOrder::getCode, orderCode)
-                    .set(TChargingOrder::getVin, vin));
+                    .set(TChargingOrder::getActualVin, vin));
         } else if (orderCode.startsWith("SD")) {
             updated = cardChargingOrderService.update(Wrappers.<TCardChargingOrder>lambdaUpdate()
                     .eq(TCardChargingOrder::getCode, orderCode)
-                    .set(TCardChargingOrder::getVin, vin));
+                    .set(TCardChargingOrder::getActualVin, vin));
         } else if (orderCode.startsWith("VD")) {
             updated = vinChargingOrderService.update(Wrappers.<TVinChargingOrder>lambdaUpdate()
                     .eq(TVinChargingOrder::getCode, orderCode)
-                    .set(TVinChargingOrder::getVin, vin));
+                    .set(TVinChargingOrder::getActualVin, vin));
         } else {
             log.warn("握手VIN回写失败,未知订单类型:{}", orderCode);
             return R.ok(false);

--
Gitblit v1.7.1