From 87e5604ad04c0b7aaacf3d52bae85e62d308cb6d Mon Sep 17 00:00:00 2001
From: zuoxiao <lf_zuo@163.com>
Date: 星期四, 26 六月 2025 16:41:02 +0800
Subject: [PATCH] refactor(generallibrary):重构开卡成功界面并移除未使用的开卡界面
---
generallibrary/src/main/java/com/dayu/general/activity/RechargeDetailActivity.kt | 235 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 186 insertions(+), 49 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 bd7b9f1..ec3c4d3 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/RechargeDetailActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/RechargeDetailActivity.kt
@@ -12,6 +12,7 @@
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import com.dayu.baselibrary.net.subscribers.SubscriberListener
+import com.dayu.baselibrary.utils.MornyUtil
import com.dayu.baselibrary.utils.ToastUtil
import com.dayu.baselibrary.view.TitleBar
import com.dayu.general.BaseApplication
@@ -22,6 +23,7 @@
import com.dayu.general.bean.net.RechargeRequest
import com.dayu.general.bean.net.RechargeResult
import com.dayu.general.bean.card.UserCard
+import com.dayu.general.bean.net.PaymentMethodListResponse
import com.dayu.general.databinding.ActivityRechargeDetailBinding
import com.dayu.general.net.ApiManager
import com.dayu.general.net.BaseResponse
@@ -37,7 +39,7 @@
// 鏀粯鏂瑰紡鐩稿叧灞炴��
private var paymentMethod: String = "鐜伴噾"
- private var paymentId: Long = 0
+ private var paymentId: String = ""
private var paymentMethodList: List<PaymentMethod> = listOf()
companion object {
@@ -45,7 +47,12 @@
private const val EXTRA_CARD_ADDRESS = "extra_card_address"
private const val EXTRA_USER_CARD = "extra_user_card"
- fun start(context: Context, cardInfo: CardInfoResult?, cardAddress: String?, userCard: UserCard?) {
+ fun start(
+ context: Context,
+ cardInfo: CardInfoResult?,
+ cardAddress: String?,
+ userCard: UserCard?
+ ) {
val intent = Intent(context, RechargeDetailActivity::class.java)
intent.putExtra(EXTRA_CARD_INFO, cardInfo)
intent.putExtra(EXTRA_CARD_ADDRESS, cardAddress)
@@ -86,7 +93,7 @@
// 澶勭悊鍏呭�奸�昏緫
handleRecharge()
}
-
+
// 璁剧疆閲戦杈撳叆闄愬埗
setupAmountInputLimit(binding.rechargeMorny)
setupAmountInputLimit(binding.rechargeWater)
@@ -98,13 +105,13 @@
private fun setupAmountInputLimit(editText: EditText) {
editText.addTextChangedListener(object : TextWatcher {
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-
+
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-
+
override fun afterTextChanged(s: Editable?) {
val text = s.toString()
if (text.isEmpty()) return
-
+
// 妫�鏌ユ槸鍚﹀寘鍚皬鏁扮偣
if (text.contains(".")) {
val parts = text.split(".")
@@ -120,7 +127,7 @@
}
}
}
-
+
// 闃叉杈撳叆澶氫釜灏忔暟鐐�
val dotCount = text.count { it == '.' }
if (dotCount > 1) {
@@ -130,7 +137,7 @@
editText.setSelection(newText.length)
editText.addTextChangedListener(this)
}
-
+
// 闃叉浠ュ皬鏁扮偣寮�澶�
if (text.startsWith(".")) {
editText.removeTextChangedListener(this)
@@ -143,23 +150,60 @@
}
/**
- * 鑾峰彇鏀粯鏂瑰紡鍒楄〃
+ * 鑾峰彇鏀粯鏂瑰紡鍒楄〃 - 浣跨敤Object绫诲瀷瀹夊叏澶勭悊JSON鏁扮粍
*/
private fun getPaymentMethods() {
ApiManager.getInstance().requestGetLoading(
this,
- "sell/paymentmethod/get",
- PaymentMethodResponse::class.java,
+ "terminal/paymentmethod/get",
+ Any::class.java,
null,
- object : SubscriberListener<BaseResponse<PaymentMethodResponse>>() {
- override fun onNext(response: BaseResponse<PaymentMethodResponse>) {
+ object : SubscriberListener<BaseResponse<Any>>() {
+ override fun onNext(response: BaseResponse<Any>) {
if (response.success) {
- // 鑾峰彇鏀粯鏂瑰紡鍒楄〃
- val paymentMethods = response.content?.obj ?: listOf()
- if (paymentMethods.isNotEmpty()) {
- paymentMethodList = paymentMethods
- // 鏇存柊鏀粯鏂瑰紡鏄剧ず
- updatePaymentMethodRadioGroup()
+ try {
+ // 瀹夊叏鍦板鐞嗚繑鍥炵殑content锛屾湇鍔″櫒杩斿洖鐨勬槸ArrayList<LinkedHashMap>
+ val paymentMethods = mutableListOf<PaymentMethod>()
+ val content = response.content
+
+ if (content is List<*>) {
+ content.forEach { item ->
+ if (item is Map<*, *>) {
+ val id = item["id"]?.toString() ?: ""
+ val name = item["name"]?.toString() ?: ""
+ if (id.isNotEmpty() && name.isNotEmpty()) {
+ paymentMethods.add(PaymentMethod(id, name))
+ }
+ }
+ }
+ }
+
+ if (paymentMethods.isNotEmpty()) {
+ paymentMethodList = paymentMethods
+ // 鏇存柊鏀粯鏂瑰紡鏄剧ず
+ updatePaymentMethodRadioGroup()
+
+ // 璋冭瘯鏃ュ織
+ android.util.Log.d("RechargeDetail", "鎴愬姛鑾峰彇${paymentMethods.size}涓敮浠樻柟寮�:")
+ paymentMethods.forEach { method ->
+ android.util.Log.d("RechargeDetail", "- ID: ${method.id}, Name: ${method.name}")
+ }
+ } else {
+ Toast.makeText(
+ this@RechargeDetailActivity,
+ "鑾峰彇鏀粯鏂瑰紡澶辫触锛氳繑鍥炴暟鎹负绌�",
+ Toast.LENGTH_SHORT
+ ).show()
+ }
+ } catch (e: Exception) {
+ android.util.Log.e("RechargeDetail", "瑙ｆ瀽鏀粯鏂瑰紡鏁版嵁澶辫触", e)
+ android.util.Log.e("RechargeDetail", "鍘熷鏁版嵁绫诲瀷: ${response.content?.javaClass?.name}")
+ android.util.Log.e("RechargeDetail", "鍘熷鏁版嵁鍐呭: $response.content")
+ Toast.makeText(
+ this@RechargeDetailActivity,
+ "瑙ｆ瀽鏀粯鏂瑰紡鏁版嵁澶辫触: ${e.message}",
+ Toast.LENGTH_SHORT
+ ).show()
}
} else {
Toast.makeText(
@@ -172,6 +216,7 @@
override fun onError(e: Throwable?) {
super.onError(e)
+ android.util.Log.e("RechargeDetail", "缃戠粶璇锋眰澶辫触", e)
Toast.makeText(
this@RechargeDetailActivity,
"鑾峰彇鏀粯鏂瑰紡澶辫触: ${e?.message ?: "缃戠粶寮傚父"}",
@@ -249,9 +294,9 @@
binding.redInitCode.text = cardAddress ?: ""
binding.userName.text = info.userName ?: ""
binding.redCardNum.text = info.cardNum ?: ""
-
+
// 浣跨敤鐢ㄦ埛鍗′腑鐨勪綑棰濇樉绀�
- val balance = userCard?.let {
+ val balance = userCard?.let {
// 灏嗗垎杞崲涓哄厓锛屼繚鐣欎袱浣嶅皬鏁�
String.format("%.2f", it.balance / 100.0)
} ?: run {
@@ -261,7 +306,7 @@
binding.redRemainderBlance.text = "$balance 鍏�"
// 璁剧疆鍗＄姸鎬佸拰瀵瑰簲棰滆壊
- val cardStatus = when (info.status) {
+ val cardStatus = when (info.state) {
1 -> "姝ｅ父"
2 -> "鎸傚け"
3 -> "閿佸畾"
@@ -271,7 +316,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") // 绾㈣壊-閿佸畾
@@ -316,31 +361,62 @@
0.0
}
- // 璋冪敤鍏呭�兼帴鍙�
- callRechargeApi(rechargeAmount, bonusAmount)
+ // 鑾峰彇褰撳墠浣欓锛堣浆鎹负鍏冿級
+ 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(currentBalance, rechargeAmount, bonusAmount)
}
/**
* 璋冪敤鍏呭�兼帴鍙�
*/
- private fun callRechargeApi(rechargeAmount: Double, bonusAmount: Double) {
+ private fun callRechargeApi(currentBalance: Double, rechargeAmount: Double, bonusAmount: Double) {
val cardNum = cardInfo?.cardNum ?: cardAddress ?: ""
if (cardNum.isEmpty()) {
ToastUtil.show("鍗″彿淇℃伅缂哄け")
return
}
+ // 楠岃瘉鏀粯鏂瑰紡鏄惁宸查�夋嫨锛屽鏋滀负绌哄垯閲嶆柊鑾峰彇鏀粯鏂瑰紡
+ if (paymentId.isEmpty()) {
+ ToastUtil.show("鏀粯鏂瑰紡鏈姞杞斤紝姝ｅ湪閲嶆柊鑾峰彇...")
+ // 閲嶆柊鑾峰彇鏀粯鏂瑰紡锛屾垚鍔熷悗鑷姩閲嶈瘯鍏呭��
+ getPaymentMethodsAndRetryRecharge(currentBalance, rechargeAmount, bonusAmount)
+ return
+ }
+
// 鑾峰彇姘翠环锛堝鏋滀负绌轰細鑷姩瑙﹀彂MainActivity鑾峰彇锛�
val currentWaterPrice = BaseApplication.requestWaterPrice()
- // 鏋勫缓鍏呭�艰姹傚弬鏁�
+ // 鎵撳嵃璋冭瘯淇℃伅
+ android.util.Log.d("RechargeDetail", "鍏呭�煎弬鏁� - paymentMethod: $paymentMethod, paymentId: $paymentId")
+ android.util.Log.d("RechargeDetail", "瀛楁鍚箟 - money(褰撳墠浣欓): ${String.format("%.2f", currentBalance)}鍏�, amount(鍏呭�奸噾棰�): ${String.format("%.2f", rechargeAmount)}鍏�, gift(璧犻�侀噾棰�): ${String.format("%.2f", bonusAmount)}鍏�")
+
+ // 鏋勫缓鍏呭�艰姹傚弬鏁� - 淇瀛楁鍚箟
val rechargeRequest = RechargeRequest(
rechargeType = 2,
cardNum = cardNum,
- money = String.format("%.0f", rechargeAmount),
- amount = String.format("%.0f", bonusAmount),
- gift = String.format("%.0f", bonusAmount),
- paymentId = paymentId.toString(),
+ money = String.format("%.2f", currentBalance), // money涓哄綋鍓嶅崱浣欓
+ amount = String.format("%.2f", rechargeAmount), // amount涓哄厖鍊奸噾棰�
+ gift = String.format("%.2f", bonusAmount), // gift涓鸿禒閫侀噾棰�
+ paymentId = paymentId,
price = String.format("%.2f", currentWaterPrice), // 浣跨敤缁熶竴鑾峰彇鐨勬按浠�
remarks = "鍏呭��",
operator = BaseApplication.userId // 榛樿鎿嶄綔鍛業D锛屽彲浠ユ牴鎹疄闄呮儏鍐佃皟鏁�
@@ -387,27 +463,86 @@
}
/**
+ * 閲嶆柊鑾峰彇鏀粯鏂瑰紡骞堕噸璇曞厖鍊�
+ */
+ private fun getPaymentMethodsAndRetryRecharge(currentBalance: Double, rechargeAmount: Double, bonusAmount: Double) {
+ ApiManager.getInstance().requestGetLoading(
+ this,
+ "terminal/paymentmethod/get",
+ Any::class.java,
+ null,
+ object : SubscriberListener<BaseResponse<Any>>() {
+ override fun onNext(response: BaseResponse<Any>) {
+ if (response.success) {
+ try {
+ // 瀹夊叏鍦板鐞嗚繑鍥炵殑content锛屾湇鍔″櫒杩斿洖鐨勬槸ArrayList<LinkedHashMap>
+ val paymentMethods = mutableListOf<PaymentMethod>()
+ val content = response.content
+
+ if (content is List<*>) {
+ content.forEach { item ->
+ if (item is Map<*, *>) {
+ val id = item["id"]?.toString() ?: ""
+ val name = item["name"]?.toString() ?: ""
+ if (id.isNotEmpty() && name.isNotEmpty()) {
+ paymentMethods.add(PaymentMethod(id, name))
+ }
+ }
+ }
+ }
+
+ if (paymentMethods.isNotEmpty()) {
+ paymentMethodList = paymentMethods
+ // 鏇存柊鏀粯鏂瑰紡鏄剧ず
+ updatePaymentMethodRadioGroup()
+ // 鏀粯鏂瑰紡鍔犺浇鎴愬姛鍚庯紝鑷姩閲嶈瘯鍏呭��
+ ToastUtil.show("鏀粯鏂瑰紡鍔犺浇鎴愬姛锛屾鍦ㄩ噸璇曞厖鍊�...")
+ callRechargeApi(currentBalance, rechargeAmount, bonusAmount)
+ } else {
+ ToastUtil.show("鑾峰彇鏀粯鏂瑰紡澶辫触锛氳繑鍥炴暟鎹负绌�")
+ }
+ } catch (e: Exception) {
+ android.util.Log.e("RechargeDetail", "瑙ｆ瀽鏀粯鏂瑰紡鏁版嵁澶辫触", e)
+ android.util.Log.e("RechargeDetail", "鍘熷鏁版嵁绫诲瀷: ${response.content?.javaClass?.name}")
+ android.util.Log.e("RechargeDetail", "鍘熷鏁版嵁鍐呭: ${response.content}")
+ ToastUtil.show("瑙ｆ瀽鏀粯鏂瑰紡鏁版嵁澶辫触: ${e.message}")
+ }
+ } else {
+ ToastUtil.show("鑾峰彇鏀粯鏂瑰紡澶辫触: ${response.msg}")
+ }
+ }
+
+ override fun onError(e: Throwable?) {
+ super.onError(e)
+ ToastUtil.show("鑾峰彇鏀粯鏂瑰紡澶辫触: ${e?.message ?: "缃戠粶寮傚父"}")
+ }
+ }
+ )
+ }
+
+ /**
* 鍚姩鍐欏崱鐣岄潰
*/
- private fun startWriteCardActivity(rechargeResult: RechargeResult, rechargeAmount: Double, bonusAmount: Double) {
+ private fun startWriteCardActivity(
+ rechargeResult: RechargeResult,
+ rechargeAmount: Double,
+ bonusAmount: Double
+ ) {
try {
- // 鍒涘缓UserCard瀵硅薄鐢ㄤ簬鍐欏崱
- 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
- }
+ // 妫�鏌ユ槸鍚︽湁浼犻�掕繃鏉ョ殑userCard瀵硅薄
+ val cardToWrite = this.userCard ?: run {
+ ToastUtil.show("鐢ㄦ埛鍗′俊鎭己澶�")
+ return
+ }
+
+ // 鏇存柊浼犻�掕繃鏉ョ殑UserCard瀵硅薄鏁版嵁
+ cardToWrite.apply {
+ // 鏇存柊鍏呭�煎悗鐨勪綑棰�
+ balance = MornyUtil.changeY2F(rechargeResult.balance)
- // 璁剧疆鍏朵粬蹇呰淇℃伅
+ // 鏇存柊鍏朵粬鍏呭�肩浉鍏充俊鎭�
projectCode = rechargeResult.projectNo
- waterPrice = rechargeResult.waterPrice.toFloat()
+ waterPrice = MornyUtil.changeY2F(rechargeResult.waterPrice.toString())
rechargeDate = java.util.Calendar.getInstance()
}
@@ -417,12 +552,14 @@
putExtra("cardAddr", cardAddress)
putExtra("operationTypeCode", CardOperationType.Recharge.code)
putExtra("orderNumber", rechargeResult.orderNo)
- putExtra("userCard", userCard)
+ putExtra("userCard", cardToWrite)
putExtra("rechargeAmount", rechargeAmount) // 浼犻�掑厖鍊奸噾棰�
putExtra("bonusAmount", bonusAmount) // 浼犻�掕禒閫侀噾棰�
+ putExtra("cardInfo", cardInfo)
+ putExtra(EXTRA_CARD_INFO, cardInfo)
}
startActivity(intent)
-
+ finish()
} catch (e: Exception) {
ToastUtil.show("鍚姩鍐欏崱鐣岄潰澶辫触: ${e.message}")
}
--
Gitblit v1.8.0