From 8e330754825e837be6b6d71939c5ae9574b70109 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期六, 27 一月 2024 08:58:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeCardOperateMapper.java |   36 ++++++++++++++++++++++++++++++++----
 1 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeCardOperateMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeCardOperateMapper.java
index 0b905c9..1acd2b6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeCardOperateMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeCardOperateMapper.java
@@ -2,9 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dy.pipIrrGlobal.pojoSe.SeCardOperate;
-import com.dy.pipIrrGlobal.voSe.VoRecharge;
-import com.dy.pipIrrGlobal.voSe.VoTransaction;
-import com.dy.pipIrrGlobal.voSe.VoTransactionStatistics;
+import com.dy.pipIrrGlobal.voSe.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -91,9 +89,39 @@
 
     /**
      * 鑾峰彇鎸囧畾鏃ユ湡銆佹寚瀹氭敮浠樻柟寮忓疄鏀堕噾棰濆悎璁�
-     * @param params
+     * @param tradeDate
+     * @param paymentId
      * @return
      */
     //Float getPaymentSums(Map<?, ?> params);
     Float getPaymentSums(@Param("tradeDate") String tradeDate, @Param("paymentId") Long paymentId);
+
+    /**
+     * 鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍗¤褰曟暟
+     * @param params
+     * @return
+     */
+    Long getActiveCardRecordCount(Map<?, ?> params);
+
+    /**
+     * 鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍗¤褰�
+     * @param params
+     * @return
+     */
+    List<VoActiveCardNew> getActiveCards(Map<?, ?> params);
+
+
+    /**
+     * 鏍规嵁鎸囧畾鏉′欢鑾峰彇琛ュ崱璁板綍鏁�
+     * @param params
+     * @return
+     */
+    Long getReissueCardRecordCount(Map<?, ?> params);
+
+    /**
+     * 鏍规嵁鎸囧畾鏉′欢鑾峰彇琛ュ崱璁板綍
+     * @param params
+     * @return
+     */
+    List<VoReissueCard> getReissueCards(Map<?, ?> params);
 }
\ No newline at end of file

--
Gitblit v1.8.0