From 98835fa85ab003f9511d453c527873d21eed1812 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 17 十月 2024 16:18:33 +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/TChargingOrderService.java |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java
index d096708..0593bb3 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java
@@ -17,6 +17,8 @@
 import com.ruoyi.order.api.vo.*;
 import com.ruoyi.order.dto.*;
 import com.ruoyi.order.vo.ChargingOrderListInfoVO;
+import com.ruoyi.order.vo.EndOfChargePageInfo;
+
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
@@ -168,7 +170,14 @@
 	 * @param code
 	 */
 	void endCharge(String code, Integer endMode);
-
+	
+	/**
+	 * 停止充电返回账单后计算费用
+	 * @param vo
+	 */
+	void endChargeBillingCharge(TransactionRecordMessageVO vo);
+	
+	
 
 	/**
 	 * 异常结束充电处理逻辑
@@ -248,4 +257,12 @@
 	List<Map<String, Object>> countAllUserData();
 
 	List<Map<String, Object>> needElec1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
+	
+	
+	/**
+	 * 获取充电结束页面详情
+	 * @param id
+	 * @return
+	 */
+	EndOfChargePageInfo getEndOfChargePageInfo(String id);
 }

--
Gitblit v1.7.1