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 | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 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 65a9a42..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) } -- Gitblit v1.8.0