From bd57a2d81f6be03ec26df9afc4bb01d9f08371c5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 24 十月 2024 14:59:46 +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 |   10 +++++++++-
 1 files changed, 9 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 5af0c8e..bd3928f 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
@@ -170,7 +170,14 @@
 	 * @param code
 	 */
 	void endCharge(String code, Integer endMode);
-
+	
+	/**
+	 * 停止充电返回账单后计算费用
+	 * @param vo
+	 */
+	void endChargeBillingCharge(TransactionRecordMessageVO vo);
+	
+	
 
 	/**
 	 * 异常结束充电处理逻辑
@@ -190,6 +197,7 @@
 	List<Map<String, Object>> usersDay1();
 
 	List<Map<String, Object>> usersByQuery(ChargingStatisticsQueryDto statisticsQueryDto);
+	List<Map<String, Object>> usersByQuery1(ChargingStatisticsQueryDto statisticsQueryDto);
 
 
 	List<Map<String, Object>> getUserTagCount();

--
Gitblit v1.7.1