From 8236caa8042288fcb9b584c21d6157f713183626 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 13 二月 2025 16:36:01 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
index 3d81a92..60b7526 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
@@ -325,6 +325,8 @@
                         tChargingOrder.setLicensePlate(data4.getLicensePlate());
                         tChargingOrder.setVehicleModel(data4.getVehicleModel());
                     }
+                }else{
+                    tChargingOrder.setLicensePlate(tChargingOrder.getPlateNum());
                 }
                 if (data3!=null)tChargingOrder.setUserName(data3.getName());
                 // 累加实收金额 支付结算金额
@@ -754,6 +756,8 @@
                         tChargingOrder.setLicensePlate(tAppUserCar.getLicensePlate());
                         tChargingOrder.setVehicleModel(tAppUserCar.getVehicleModel());
                     }
+                }else{
+                    tChargingOrder.setLicensePlate(tChargingOrder.getPlateNum());
                 }
                 if (data3!=null)tChargingOrder.setUserName(data3.getName());
                 if ( tChargingOrder.getPaymentAmount()!=null){

--
Gitblit v1.7.1