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 图标用于返还操作

---
 qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/utils/ExcelUtil.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/utils/ExcelUtil.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/utils/ExcelUtil.java
index 2b82c1d..beefc7a 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/utils/ExcelUtil.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/utils/ExcelUtil.java
@@ -132,7 +132,7 @@
                         RechargeBean projectBean = (RechargeBean) objList.get(j);
                         list.add(projectBean.getSerial());
                         list.add(projectBean.getUserName());
-                        list.add(projectBean.getOrderID());
+                        list.add(projectBean.getCardNumber());
                         list.add(DateUtil.dateToStamp(projectBean.getDate(), DateUtil.type2));
                         list.add(projectBean.getMorny());
                         list.add(projectBean.getBalance());
@@ -141,6 +141,7 @@
                         list.add(userCardBean.getSerial());
                         list.add(userCardBean.getUserName());
                         list.add(userCardBean.getUserID());
+                        list.add(userCardBean.getCardNumber());
                         list.add(DateUtil.dateToStamp(userCardBean.getDate(), DateUtil.type2));
                         list.add(userCardBean.getPhone());
                     }

--
Gitblit v1.8.0