From 80eb39909e0d5c181dc8d6e282a292146ec51e21 Mon Sep 17 00:00:00 2001
From: zuoxiao <lf_zuo@163.com>
Date: 星期三, 25 六月 2025 14:36:04 +0800
Subject: [PATCH] refactor(card): 重构卡片制作流程并添加项目号支持
---
generallibrary/src/main/java/com/dayu/general/activity/RechargeDetailActivity.kt | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 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 f460d84..97ad182 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/RechargeDetailActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/RechargeDetailActivity.kt
@@ -154,7 +154,7 @@
private fun getPaymentMethods() {
ApiManager.getInstance().requestGetLoading(
this,
- "sell/paymentmethod/get",
+ "terminal/paymentmethod/get",
PaymentMethodResponse::class.java,
null,
object : SubscriberListener<BaseResponse<PaymentMethodResponse>>() {
@@ -322,6 +322,25 @@
0.0
}
+ // 鑾峰彇褰撳墠浣欓锛堣浆鎹负鍏冿級
+ val currentBalance = userCard?.let {
+ // 灏嗗垎杞崲涓哄厓
+ it.balance / 100.0
+ } ?: run {
+ // 濡傛灉鐢ㄦ埛鍗′负绌猴紝鍒欎娇鐢ㄦ湇鍔″櫒杩斿洖鐨勪綑棰�
+ cardInfo?.balance ?: 0.0
+ }
+
+ // 璁＄畻鍏呭�煎悗鐨勬�讳綑棰�
+ val totalAmountAfterRecharge = currentBalance + rechargeAmount + bonusAmount
+
+ // 妫�鏌ユ槸鍚﹁秴杩囨渶澶т綑棰濋檺鍒�9999.99鍏�
+ if (totalAmountAfterRecharge > 9999.99) {
+ val maxRechargeAmount = 9999.99 - currentBalance
+ ToastUtil.show("鍏呭�煎け璐ワ細鍏呭�煎悗浣欓涓嶈兘瓒呰繃9999.99鍏僜n褰撳墠浣欓锛�${String.format("%.2f", currentBalance)}鍏僜n鏈�澶氬彲鍏呭�硷細${String.format("%.2f", maxRechargeAmount)}鍏�")
+ return
+ }
+
// 璋冪敤鍏呭�兼帴鍙�
callRechargeApi(rechargeAmount, bonusAmount)
}
@@ -405,15 +424,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)
}
// 璁剧疆鍏朵粬蹇呰淇℃伅
--
Gitblit v1.8.0