From ec2cbf749e996ed7685ca903be740dae926579dc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 31 八月 2026 17:05:34 +0800
Subject: [PATCH] 瀹屽杽鍒峰崱鍏呯數璁㈠崟鏌ヨ鎺ュ彛

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TCardChargingOrderMapper.java |   27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TCardChargingOrderMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TCardChargingOrderMapper.java
index 0267763..44a0250 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TCardChargingOrderMapper.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TCardChargingOrderMapper.java
@@ -1,10 +1,9 @@
 package com.ruoyi.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.order.api.model.TCardChargingOrder;
 import com.ruoyi.order.api.query.CardChargingOrderQuery;
+import com.ruoyi.order.api.vo.ChargingOrderVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -12,11 +11,31 @@
 
 public interface TCardChargingOrderMapper extends BaseMapper<TCardChargingOrder> {
 
-    IPage<Map<String, Object>> pageList(Page<?> page, @Param("query") CardChargingOrderQuery query);
+    List<ChargingOrderVO> pageList(@Param("query") CardChargingOrderQuery query,
+                                   @Param("startTime1") String startTime1,
+                                   @Param("startTime2") String startTime2,
+                                   @Param("endTime1") String endTime1,
+                                   @Param("endTime2") String endTime2,
+                                   @Param("offset") long offset,
+                                   @Param("pageSize") long pageSize);
 
-    Map<String, Object> summary(@Param("query") CardChargingOrderQuery query);
+    long count(@Param("query") CardChargingOrderQuery query,
+               @Param("startTime1") String startTime1,
+               @Param("startTime2") String startTime2,
+               @Param("endTime1") String endTime1,
+               @Param("endTime2") String endTime2);
+
+    Map<String, Object> summary(@Param("query") CardChargingOrderQuery query,
+                                @Param("startTime1") String startTime1,
+                                @Param("startTime2") String startTime2,
+                                @Param("endTime1") String endTime1,
+                                @Param("endTime2") String endTime2);
 
     List<Map<String, Object>> balanceIncomeDetail(@Param("query") CardChargingOrderQuery query);
 
     List<Map<String, Object>> accountingStrategyList(@Param("chargingOrderId") Long chargingOrderId);
+
+    List<Map<String, Object>> shareIncomeByOrderIds(@Param("orderIds") List<Long> orderIds);
+
+    Map<String, Object> shareIncomeSummaryByOrderIds(@Param("orderIds") List<Long> orderIds);
 }

--
Gitblit v1.7.1