From e9dcc1d3da82d6de18a81279c3f87773de7b4cfa Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 12 九月 2024 14:55:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index 50d9583..85e408c 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -1907,7 +1907,7 @@
 			tSettlementConfirm.setVenue(dto.getVenue());
 			tSettlementConfirm.setMetering(dto.getMetering());
 			tSettlementConfirm.setClean(dto.getClean());
-			tSettlementConfirm.setLossElectronic(dto.getLossElectronic());
+			tSettlementConfirm.setLossElectronic(dto.getMeteringElectronic().subtract(dto.getChargingElectronic()));
 			tSettlementConfirm.setMaintain(dto.getMaintain());
 
 			tSettlementConfirm.setMeteringElectronic(dto.getMeteringElectronic());

--
Gitblit v1.7.1