From 67b0c9e1e81f4eef2438e31b4009a4da5d14b66c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 18 三月 2025 20:37:01 +0800
Subject: [PATCH] 修改报表bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 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 9689489..64b1198 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
@@ -100,8 +100,13 @@
* @return
*/
AjaxResult chargingOrderStartupFailureWxRefund(String out_refund_no, String refund_id, String tradeState, String success_time);
-
-
+
+
+ /**
+ * 启动失败退款操作
+ * @param code
+ */
+ void refund(String code);
/**
* 获取充电中的详情
@@ -141,15 +146,15 @@
Map<String, Object> countAll(LocalDate sixBefore,List<Integer> siteIds);
- List<Map<String, Object>> getSumByType(List<Long> chargingOrderIds);
+ List<Map<String, Object>> getSumByType(LocalDate start,LocalDate end,List<Integer> siteIds);
- List<Map<String, Object>> getDateData(List<Long> chargingOrderIds);
+ List<Map<String, Object>> getDateData(LocalDate start,LocalDate end,List<Integer> siteIds);
- List<Map<String, Object>> getWeekData(List<Long> chargingOrderIds);
+ List<Map<String, Object>> getWeekData(LocalDate start,LocalDate end);
- List<Map<String, Object>> getMonthData(List<Long> chargingOrderIds);
+ List<Map<String, Object>> getMonthData(LocalDate start,LocalDate end);
- List<Map<String, Object>> getYearData(List<Long> chargingOrderIds);
+ List<Map<String, Object>> getYearData(LocalDate start,LocalDate end);
ChargingOrderTimeVO chargingList(ChargingListQuery dto);
@@ -185,7 +190,7 @@
*/
void excelEndCharge(String orderCode);
- List<Map<String, Object>> getByDate(List<Long> chargingOrderIds);
+ List<Map<String, Object>> getByDate(LocalDate start,LocalDate end);
List<Map<String, Object>> queryPower(List<Integer> siteIds);
--
Gitblit v1.7.1