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 图标用于返还操作
---
generallibrary/src/main/java/com/dayu/general/bean/db/CardRegistrationBean.kt | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/generallibrary/src/main/java/com/dayu/general/bean/db/CardRegistrationBean.kt b/generallibrary/src/main/java/com/dayu/general/bean/db/CardRegistrationBean.kt
index e758469..42faeda 100644
--- a/generallibrary/src/main/java/com/dayu/general/bean/db/CardRegistrationBean.kt
+++ b/generallibrary/src/main/java/com/dayu/general/bean/db/CardRegistrationBean.kt
@@ -10,12 +10,13 @@
val cardNumber: String, // IC鍗″崱鍙�
val userName: String, // 濮撳悕
val idCard: String, // 韬唤璇佸彿
- val farmerCode: String, // 鍐滄埛缂栧彿
- val cardFee: Double, // 宸ユ湰璐�
+ val clientId: String, // 鍐滄埛Id
+ val cardFee: Int, // 宸ユ湰璐�
val remark: String, // 澶囨敞
val paymentMethod: Int, // 鏀粯鏂瑰紡
val orderId: String? = null, // 璁㈠崟id锛屽垵濮嬩负null锛屽悗缁洿鏂�
val isReported: Boolean = false, // 鏄惁涓婃姤鎴愬姛
val isCardWritten: Boolean = false, // 鏄惁鍐欏崱鎴愬姛
+ val operatorId: String = "", // 鎿嶄綔浜篿d
val createTime: Long = System.currentTimeMillis() // 鍒涘缓鏃堕棿
)
\ No newline at end of file
--
Gitblit v1.8.0