From c80c0184b6e560d41d5aa5691874e07b681fa18f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 17 一月 2025 18:41:24 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java |    9 ++++++++-
 1 files changed, 8 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 eae2704..097546f 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
@@ -140,7 +140,7 @@
 
 	List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore);
 
-	Map<String, Object> countAll(LocalDate sixBefore);
+	Map<String, Object> countAll(LocalDate sixBefore,List<Integer> siteIds);
 
     List<Map<String, Object>> getSumByType(List<Long> chargingOrderIds);
 
@@ -177,6 +177,12 @@
 	 * @param vo
 	 */
 	void endChargeBillingCharge(TransactionRecordMessageVO vo);
+	
+//	/**
+//	 * 停止充电返回账单后计算费用
+//	 * @param vo
+//	 */
+//	void endChargeBillingCharge1(TransactionRecordMessageVO vo);
 	
 	
 
@@ -231,6 +237,7 @@
 	PageInfo<TSettlementConfirm> settlementList(SettlementListQuery dto);
 
     SettlementTotalVO settlementTotal(String time);
+    SettlementTotalVO settlementTotalR(String time,Long userId);
 
 	List<Map<String, Object>> countBySource(List<Integer> siteIds,ChargingStatisticsQueryDto statisticsQueryDto);
 

--
Gitblit v1.7.1