From 20952db304d0f71e1ce25f3b82114bbadff1ad4a Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 20 六月 2025 16:51:54 +0800
Subject: [PATCH] feat(generallibrary): 补充补卡功能
---
generallibrary/src/main/java/com/dayu/general/activity/RechargeDetailActivity.kt | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/generallibrary/src/main/java/com/dayu/general/activity/RechargeDetailActivity.kt b/generallibrary/src/main/java/com/dayu/general/activity/RechargeDetailActivity.kt
index 8ea5625..65a9a42 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/RechargeDetailActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/RechargeDetailActivity.kt
@@ -267,7 +267,7 @@
binding.redRemainderBlance.text = "$balance 鍏�"
// 璁剧疆鍗＄姸鎬佸拰瀵瑰簲棰滆壊
- val cardStatus = when (info.status) {
+ val cardStatus = when (info.state) {
1 -> "姝ｅ父"
2 -> "鎸傚け"
3 -> "閿佸畾"
@@ -277,7 +277,7 @@
binding.redStatu.text = cardStatus
// 鏍规嵁鍗＄姸鎬佽缃笉鍚岄鑹�
- val statusColor = when (info.status) {
+ val statusColor = when (info.state) {
1 -> android.graphics.Color.parseColor("#4CAF50") // 缁胯壊-姝ｅ父
2 -> android.graphics.Color.parseColor("#FF9800") // 姗欒壊-鎸傚け
3 -> android.graphics.Color.parseColor("#F44336") // 绾㈣壊-閿佸畾
@@ -405,15 +405,7 @@
val userCard = UserCard().apply {
// 璁剧疆鐢ㄦ埛鍗′俊鎭�
cardInfo?.let { info ->
- userCode = info.cardNum ?: ""
-
- // 璁＄畻鏂颁綑棰濓細鍘熸湁浣欓 + 鍏呭�奸噾棰� + 璧犻�侀噾棰�
- val originalBalance =
- this@RechargeDetailActivity.userCard?.balance ?: 0 // 鍘熸湁浣欓锛堝垎锛�
- val rechargeAmountInCents = (rechargeAmount * 100).toInt() // 鍏呭�奸噾棰濊浆鍒�
- val bonusAmountInCents = (bonusAmount * 100).toInt() // 璧犻�侀噾棰濊浆鍒�
-
- balance = originalBalance + rechargeAmountInCents + bonusAmountInCents
+ balance = MornyUtil.changeY2F(rechargeResult.balance)
}
// 璁剧疆鍏朵粬蹇呰淇℃伅
@@ -433,7 +425,7 @@
putExtra("bonusAmount", bonusAmount) // 浼犻�掕禒閫侀噾棰�
}
startActivity(intent)
-
+ finish()
} catch (e: Exception) {
ToastUtil.show("鍚姩鍐欏崱鐣岄潰澶辫触: ${e.message}")
}
--
Gitblit v1.8.0