From 22aba721f5498d42156885d0e9e596c41f426d71 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 07 二月 2025 16:17:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 dd6c3c0..78112c2 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);
@@ -176,7 +176,7 @@
* 停止充电返回账单后计算费用
* @param vo
*/
- void endChargeBillingCharge(TransactionRecordMessageVO vo);
+ R endChargeBillingCharge(TransactionRecordMessageVO vo);
@@ -194,7 +194,7 @@
List<Map<String, Object>> queryOrderCountAndMoneyBySiteIdDate(List<Integer> siteIds);
- List<Map<String, Object>> usersDay();
+ List<Map<String, Object>> usersDay(ChargingStatisticsQueryDto statisticsQueryDto);
List<Map<String, Object>> usersDay1();
List<Map<String, Object>> usersByQuery(ChargingStatisticsQueryDto statisticsQueryDto);
--
Gitblit v1.7.1