From 08bfe3072377b53c60e0952f00c26bce2e5b4bc0 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 18 六月 2025 17:05:55 +0800
Subject: [PATCH] feat(card): 添加卡片返还功能- 新增 CardReturnActivity 用于执行卡片返还操作 - 在 BSCardFragment 中添加返还按钮,跳转到 CardReturnActivity - 在 CardOperationType 中添加 ReturnCard 类型 - 修改 CardReadActivity,优化卡片信息显示逻辑 - 更新 CardWriteSuccessActivity,支持返还成功提示 - 新增 ic_morny_back 图标用于返还操作

---
 qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/dao/RechargeDao.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/dao/RechargeDao.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/dao/RechargeDao.java
index b057c8e..437c794 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/dao/RechargeDao.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/dao/RechargeDao.java
@@ -37,9 +37,9 @@
     @Query("select  * from RechargeBean where rechargeDate>=:beginTime and rechargeDate<=:endTime")
     LiveData<List<RechargeBean>> findByTime(long beginTime, long endTime);
 
-    @Query("select  * from RechargeBean where rechargeDate>=:beginTime and rechargeDate<=:endTime")
-    List<RechargeBean> ansyFindByTime(long beginTime, long endTime);
+    @Query("select  * from RechargeBean where rechargeDate>=:beginTime and rechargeDate<=:endTime and adminId =:adminId")
+    List<RechargeBean> ansyFindByTime(String adminId,long beginTime, long endTime);
 
-    @Query("select  * from RechargeBean order by rechargeDate desc LIMIT :limit OFFSET :offset")
-    List<RechargeBean> findAll(int offset,int limit);
+    @Query("select  * from RechargeBean where adminId =:adminId   order by rechargeDate desc LIMIT :limit OFFSET :offset")
+    List<RechargeBean> findAll(String adminId,int offset,int limit);
 }

--
Gitblit v1.8.0