From d81e20bab2abbb9301324a885ef7c14327b7e957 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 13 二月 2025 14:47:22 +0800
Subject: [PATCH] 新增加维护查询数据接口
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 6a62bb7..5d79a3f 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
@@ -319,6 +319,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());
// 累加实收金额 支付结算金额
@@ -764,6 +766,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){
@@ -805,9 +809,9 @@
// 格式化为字符串
String timeString = String.format("%d小时%d分钟%d秒", hours, minutes, seconds);
chargingBillVO.setChargingTime(timeString);
- chargingBillListVO.setOrderAmount(orderAmount.subtract(refundAmount));
+ chargingBillListVO.setOrderAmount(paymentAmount);
- chargingBillListVO.setPaymentAmount(chargingBillListVO.getOrderAmount().subtract(commissionAmount).subtract(sharingAmount).setScale(2,BigDecimal.ROUND_DOWN));
+ chargingBillListVO.setPaymentAmount(paymentAmount.subtract(commissionAmount).subtract(sharingAmount).setScale(2,BigDecimal.ROUND_DOWN));
chargingBillListVO.setElectrovalence(electrovalence);
chargingBillListVO.setServiceCharge(serviceCharge.setScale(2,BigDecimal.ROUND_DOWN));
chargingBillListVO.setCommissionAmount(commissionAmount.setScale(2,BigDecimal.ROUND_DOWN));
--
Gitblit v1.7.1