From 0275498af38bc1c8fbc5bfea54f3cce3550fd6ab Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 11 二月 2025 09:57:54 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into 1.1
---
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 1fcddcc..a70cd25 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
@@ -317,6 +317,8 @@
tChargingOrder.setLicensePlate(data4.get(0).getLicensePlate());
tChargingOrder.setVehicleModel(data4.get(0).getVehicleModel());
}
+ }else{
+ tChargingOrder.setLicensePlate(tChargingOrder.getPlateNum());
}
if (data3!=null)tChargingOrder.setUserName(data3.getName());
// 累加实收金额 支付结算金额
@@ -763,6 +765,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