From 5edfd12deb166302708857515a833d1471a0f208 Mon Sep 17 00:00:00 2001 From: zuoxiao <lf_zuo@163.com> Date: 星期三, 25 六月 2025 16:15:23 +0800 Subject: [PATCH] feat(database): 增加管理卡相关功能并优化数据库结构- 新增 ManagerCardBean 数据类用于管理卡信息 - 在 AppDataBase 中添加 ManagerCardDao 接口 - 实现管理卡的数据库迁移策略 - 优化支付方式 ID 类型,从 Long改为 String - 重构更新写卡和上报状态的逻辑,支持管理卡和用户卡 --- generallibrary/src/main/java/com/dayu/general/bean/net/CardInfoResult.kt | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/generallibrary/src/main/java/com/dayu/general/bean/net/CardInfoResult.kt b/generallibrary/src/main/java/com/dayu/general/bean/net/CardInfoResult.kt index cb1e39b..bf5dd05 100644 --- a/generallibrary/src/main/java/com/dayu/general/bean/net/CardInfoResult.kt +++ b/generallibrary/src/main/java/com/dayu/general/bean/net/CardInfoResult.kt @@ -1,16 +1,33 @@ package com.dayu.general.bean.net +import java.io.Serializable + /** * 鍗$墖淇℃伅缁撴灉瀹炰綋绫� */ data class CardInfoResult( - val cardId: String? = null, // 鍗″彿 + val cardNum: String? = null, // 鍗″彿 val userName: String? = null, // 鐢ㄦ埛濮撳悕 val userCode: String? = null, // 鐢ㄦ埛缂栧彿 val phone: String? = null, // 鎵嬫満鍙� val address: String? = null, // 鍦板潃 val balance: Double? = 0.0, // 浣欓 - val status: Int? = 0, // 鍗$姸鎬�: 1-姝e父, 2-鎸傚け, 3-閿佸畾 + val state: Int? = 0, // 鍗$姸鎬�: 1-姝e父, 2-鎸傚け, 3-閿佸畾 val createTime: String? = null, // 鍒涘缓鏃堕棿 val updateTime: String? = null // 鏇存柊鏃堕棿 +) : Serializable + +/** + * 鏍规嵁瀹㈡埛缂栧彿鑾峰彇鍗′俊鎭殑杩斿洖缁撴灉 + */ +data class CardInfoByClientResult( + val cardNum: String = "", // 鍗″彿 + val cardState: Int = 0, // 鍗$墖鐘舵�佺爜 + val cardType: String = "", // 鍗$墖绫诲瀷 + val clientName: String = "", // 瀹㈡埛濮撳悕 + val clientNum: String = "", // 瀹㈡埛缂栧彿 + val idCard: Long = 0, // 韬唤璇佸彿 + val money: String = "", // 鍗″唴浣欓 + val phone: Long = 0, // 鎵嬫満鍙风爜 + val stateName: String = "" // 鍗$墖鐘舵�佸悕绉� ) \ No newline at end of file -- Gitblit v1.8.0