From 6efb0ab56534f7c5afe5d8d494d7b78625b7cd00 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 11 九月 2024 14:58:18 +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/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 24cb4c4..5d429b8 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
@@ -1882,7 +1882,7 @@
 		tSettlementConfirm.setMetering(dto.getData().getMetering());
 		tSettlementConfirm.setClean(dto.getData().getClean());
 		tSettlementConfirm.setMaintain(dto.getData().getMaintain());
-		tSettlementConfirm.setCost(dto.getData().getVenue().add(dto.getData().getClean()).add(dto.getData().getMaintain()));
+		tSettlementConfirm.setCost(dto.getData().getMaintain().subtract(dto.getData().getVenue().add(dto.getData().getClean()).add(dto.getData().getMaintain())));
 		tSettlementConfirm.setProfitMoney(new BigDecimal("0"));
 		tSettlementConfirm.setNewMoney(new BigDecimal("0"));
 		tSettlementConfirm.setNewSettlement(new BigDecimal("0"));

--
Gitblit v1.7.1