From e1399ade3e27ef74ed58d56dbbb2bf77604ff5af Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 28 四月 2025 12:41:27 +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 |    7 +++++--
 1 files changed, 5 insertions(+), 2 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 742c6f2..509ce4b 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
@@ -108,6 +108,10 @@
 	 * @param code
 	 */
 	void refund(String code);
+	
+	
+	
+	void refund1(String code, BigDecimal money);
 
 	/**
 	 * 获取充电中的详情
@@ -145,7 +149,7 @@
 
 	List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore);
 
-	Map<String, Object> countAll(LocalDateTime sixBefore, List<Integer> siteIds);
+	Map<String, Object> countAll(List<Integer> siteIds);
 
     List<Map<String, Object>> getSumByType(LocalDate start,LocalDate end,List<Integer> siteIds);
 
@@ -197,7 +201,6 @@
 
 	Map<String, Object> qureryPowerLevel(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
 
-	List<Map<String, Object>> queryOrderCountAndMoneyBySiteIdDate(List<Integer> siteIds);
 
 	List<Map<String, Object>> usersDay(ChargingStatisticsQueryDto statisticsQueryDto);
 	List<Map<String, Object>> usersDay1();

--
Gitblit v1.7.1