From dd2562d8dc2b01bcdfca3152f82f09efbbd09259 Mon Sep 17 00:00:00 2001
From: zuoxiao <lf_zuo@163.com>
Date: 星期三, 25 六月 2025 19:49:48 +0800
Subject: [PATCH] fix(generallibrary): 优化卡片处理和支付方式获取逻辑- 修复地区卡处理逻辑,增加对"00"类型卡的特殊处理 - 优化用户卡数据解析和显示逻辑,提高容错性 - 改进支付方式获取方法,增加错误处理和日志记录 -调整充值接口调用参数,确保正确传递当前余额等信息- 修复 AreaCard 中 areaNumber 类型,改为字符串处理

---
 qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/dao/RechargeDao.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 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 483fae9..437c794 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/dao/RechargeDao.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/dao/RechargeDao.java
@@ -31,15 +31,15 @@
     @Delete
     void delete(RechargeBean passWord);
 
-    @Query("select  * from RechargeBean order by date desc")
+    @Query("select  * from RechargeBean order by rechargeDate desc")
     LiveData<List<RechargeBean>> findAll();
 
-    @Query("select  * from RechargeBean where date>=:beginTime and date<=:endTime")
+    @Query("select  * from RechargeBean where rechargeDate>=:beginTime and rechargeDate<=:endTime")
     LiveData<List<RechargeBean>> findByTime(long beginTime, long endTime);
 
-    @Query("select  * from RechargeBean where date>=:beginTime and date<=: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 date 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