From 2b02b6e854a56a511588e4865ddf2c6597675329 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 16 六月 2025 16:04:54 +0800
Subject: [PATCH] feat(nfc): 添加读卡功能并优化写卡流程
---
generallibrary/src/main/java/com/dayu/general/activity/RechargeDetailActivity.kt | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 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 d8d053a..bd7b9f1 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/RechargeDetailActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/RechargeDetailActivity.kt
@@ -25,6 +25,7 @@
import com.dayu.general.databinding.ActivityRechargeDetailBinding
import com.dayu.general.net.ApiManager
import com.dayu.general.net.BaseResponse
+import com.dayu.general.tool.CardCommon.Companion.USER_CARD_TYPE_1
import com.dayu.general.tool.CardOperationType
class RechargeDetailActivity : AppCompatActivity() {
@@ -395,7 +396,13 @@
// 璁剧疆鐢ㄦ埛鍗′俊鎭�
cardInfo?.let { info ->
userCode = info.cardNum ?: ""
- balance = ((rechargeAmount + bonusAmount) * 100).toInt() // 杞崲涓哄垎
+
+ // 璁＄畻鏂颁綑棰濓細鍘熸湁浣欓 + 鍏呭�奸噾棰� + 璧犻�侀噾棰�
+ val originalBalance = this@RechargeDetailActivity.userCard?.balance ?: 0 // 鍘熸湁浣欓锛堝垎锛�
+ val rechargeAmountInCents = (rechargeAmount * 100).toInt() // 鍏呭�奸噾棰濊浆鍒�
+ val bonusAmountInCents = (bonusAmount * 100).toInt() // 璧犻�侀噾棰濊浆鍒�
+
+ balance = originalBalance + rechargeAmountInCents + bonusAmountInCents
}
// 璁剧疆鍏朵粬蹇呰淇℃伅
@@ -406,22 +413,16 @@
// 鍚姩鍐欏崱Activity
val intent = Intent(this, NfcWreatActivity::class.java).apply {
- putExtra("cardType", "USER_CARD") // 鐢ㄦ埛鍗＄被鍨�
+ putExtra("cardType", USER_CARD_TYPE_1) // 鐢ㄦ埛鍗＄被鍨�
putExtra("cardAddr", cardAddress)
putExtra("operationTypeCode", CardOperationType.Recharge.code)
putExtra("orderNumber", rechargeResult.orderNo)
putExtra("userCard", userCard)
+ putExtra("rechargeAmount", rechargeAmount) // 浼犻�掑厖鍊奸噾棰�
+ putExtra("bonusAmount", bonusAmount) // 浼犻�掕禒閫侀噾棰�
}
-
startActivity(intent)
-
- // 鏄剧ず鎴愬姛淇℃伅
- val formattedRecharge = String.format("%.2f", rechargeAmount)
- val formattedBonus = String.format("%.2f", bonusAmount)
- val formattedTotal = String.format("%.2f", rechargeAmount + bonusAmount)
-
- ToastUtil.show("鍏呭�艰鍗曞垱寤烘垚鍔焅n璁㈠崟鍙�: ${rechargeResult.orderNo}\n鍏呭�奸噾棰�: ${formattedRecharge}鍏僜n璧犻�侀噾棰�: ${formattedBonus}鍏僜n鎬婚噾棰�: ${formattedTotal}鍏僜n璇疯创鍗¤繘琛屽啓鍗℃搷浣�")
-
+
} catch (e: Exception) {
ToastUtil.show("鍚姩鍐欏崱鐣岄潰澶辫触: ${e.message}")
}
--
Gitblit v1.8.0