From 465c8abaa982fba6868a900d25316c70afc20fb7 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 18 六月 2025 13:59:46 +0800
Subject: [PATCH] feat(card): 优化销卡功能并添加写卡操作
---
generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt | 110 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 82 insertions(+), 28 deletions(-)
diff --git a/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt b/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt
index e1c384c..3bf4fce 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt
@@ -5,6 +5,7 @@
import androidx.lifecycle.lifecycleScope
import com.dayu.baselibrary.net.subscribers.SubscriberListener
import com.dayu.baselibrary.tools.nfc.NFCCallBack
+import com.dayu.baselibrary.utils.MornyUtil
import com.dayu.baselibrary.utils.ToastUtil
import com.dayu.general.bean.card.ClearCard
import com.dayu.general.bean.card.UserCard
@@ -30,10 +31,14 @@
var cardType = ""
var cardAddr = ""
var cardFee = 0
-
+
// 鍏呭�肩浉鍏抽噾棰�
private var rechargeAmount = 0.0
private var bonusAmount = 0.0
+
+ // 閿�鍗＄浉鍏充俊鎭�
+ private var refundAmount = 0.0
+ private var cardBalance = 0.0
//璁㈠崟缂栧彿
var orderNumber = ""
@@ -57,11 +62,15 @@
operationTypeCode = intent?.getIntExtra("operationTypeCode", -1) ?: -1
orderNumber = intent?.getStringExtra("orderNumber") ?: ""
operationType = CardOperationType.fromCode(operationTypeCode)
-
+
// 鑾峰彇鍏呭�肩浉鍏抽噾棰�
rechargeAmount = intent?.getDoubleExtra("rechargeAmount", 0.0) ?: 0.0
bonusAmount = intent?.getDoubleExtra("bonusAmount", 0.0) ?: 0.0
-
+
+ // 鑾峰彇閿�鍗＄浉鍏充俊鎭�
+ refundAmount = intent?.getDoubleExtra("refundAmount", 0.0) ?: 0.0
+ cardBalance = intent?.getDoubleExtra("cardBalance", 0.0) ?: 0.0
+
if (intent?.hasExtra("cardFee") == true) {
cardFee = intent?.getIntExtra("cardFee", 0) ?: 0
}
@@ -76,7 +85,27 @@
if (operationTypeCode != -1) {
when (operationType) {
CardOperationType.CleanCard -> {
- binding?.cardData?.text = "娓呴浂鍗″啓鍗�"
+ val textData = StringBuilder()
+
+ // 鍒ゆ柇鏄惁鏉ヨ嚜閿�鍗℃搷浣滐紙鏈夐��娆鹃噾棰濇垨鍗″唴浣欓淇℃伅锛�
+ if (refundAmount > 0 || cardBalance > 0) {
+ textData.append("閿�鍗℃竻闆舵搷浣淺n")
+ textData.append("鍗″湴鍧�锛�$cardAddr\n")
+
+ if (cardBalance > 0) {
+ textData.append("鍗″唴浣欓锛�${String.format("%.2f", cardBalance)}鍏僜n")
+ }
+
+ if (refundAmount > 0) {
+ textData.append("閫�娆鹃噾棰濓細${String.format("%.2f", refundAmount)}鍏�")
+ } else {
+ textData.append("鏃犻��娆鹃噾棰�")
+ }
+ } else {
+ textData.append("娓呴浂鍗″啓鍗�")
+ }
+
+ binding?.cardData?.text = textData.toString()
}
CardOperationType.OpenCard -> {
@@ -86,7 +115,7 @@
textData.append("宸ユ湰璐癸細" + cardFee + "鍏僜n")
}
if (userCard.balance != 0) {
- textData.append("鍏呭�奸噾棰濓細" + userCard.balance + "鍏�")
+ textData.append("鍏呭�奸噾棰濓細" + MornyUtil.changeF2Y(userCard.balance) + "鍏�")
}
binding?.cardData?.text = textData.toString()
@@ -95,27 +124,44 @@
CardOperationType.Recharge -> {
var textData = StringBuilder()
textData.append("鐢ㄦ埛鍏呭�糪n")
-
+
// 鏄剧ず鍏呭�奸噾棰�
if (rechargeAmount > 0) {
- textData.append("鍏呭�奸噾棰濓細" + String.format("%.2f", rechargeAmount) + "鍏僜n")
+ textData.append(
+ "鍏呭�奸噾棰濓細" + String.format(
+ "%.2f",
+ rechargeAmount
+ ) + "鍏僜n"
+ )
}
-
+
// 鏄剧ず璧犻�侀噾棰�
if (bonusAmount > 0) {
textData.append("璧犻�侀噾棰濓細" + String.format("%.2f", bonusAmount) + "鍏僜n")
}
-
+
// 鏄剧ず鎬婚噾棰濓紙鍐欏叆鍗″唴鐨勬�讳綑棰濓級
if (userCard.balance != 0) {
val totalBalanceInYuan = userCard.balance / 100.0 // 杞崲涓哄厓
- textData.append("鍗″唴鎬讳綑棰濓細" + String.format("%.2f", totalBalanceInYuan) + "鍏�")
+ textData.append(
+ "鍗″唴鎬讳綑棰濓細" + String.format(
+ "%.2f",
+ totalBalanceInYuan
+ ) + "鍏�"
+ )
}
-
+
binding?.cardData?.text = textData.toString()
}
- CardOperationType.CancelCard -> TODO()
+ CardOperationType.CancelCard -> {
+ var textData = StringBuilder()
+ textData.append("閿�鍗n")
+ textData.append("鍗″唴浣欓锛�" + MornyUtil.changeF2Y(userCard.balance) + "鍏僜n")
+ textData.append("閫�娆鹃噾棰濓細" + refundAmount + "鍏�")
+ binding?.cardData?.text = textData.toString()
+ }
+
CardOperationType.CheckCard -> TODO()
CardOperationType.DeductCard -> TODO()
CardOperationType.ReplaceCard -> TODO()
@@ -130,7 +176,7 @@
val nfcReadHelper = NfcReadHelper.getInstance(intent, this)
// 浣跨敤姝ｅ父鐨刧etCardNumber()鏂规硶锛屽畠浼氳嚜鍔ㄥ叧闂繛鎺�
val cardNumber = nfcReadHelper.getCardNumber()
-
+
if (cardNumber.isNotEmpty() && cardNumber == cardAddr) {
val nfcWreatHelper = NfcWreatHelper.getInstance(intent, this)
when (operationType) {
@@ -140,7 +186,7 @@
// 纭繚Toast鍦ㄤ富绾跨▼涓皟鐢�
runOnUiThread {
if (success) {
- postCardData(cardType, cardAddr)
+ postCardData(cardAddr)
ToastUtil.show("鍐欏崱鎴愬姛!")
} else {
// 澶勭悊鍐欏崱澶辫触鐨勬儏鍐�
@@ -156,7 +202,7 @@
// 纭繚Toast鍦ㄤ富绾跨▼涓皟鐢�
runOnUiThread {
if (flag) {
- postCardData(cardType, cardAddr)
+ postCardData(cardAddr)
} else {
ToastUtil.show("鍐欏崱澶辫触: ${msg ?: "鏈煡閿欒"}")
@@ -173,8 +219,7 @@
// 纭繚Toast鍦ㄤ富绾跨▼涓皟鐢�
runOnUiThread {
if (flag) {
- postCardData(cardType, cardAddr)
- ToastUtil.show("鍏呭�煎啓鍗℃垚鍔�!")
+ postCardData(cardAddr)
} else {
ToastUtil.show("鍏呭�煎啓鍗″け璐�: ${msg ?: "鏈煡閿欒"}")
}
@@ -183,7 +228,23 @@
})
}
- CardOperationType.CancelCard -> TODO()
+ CardOperationType.CancelCard -> {
+ var userCard = UserCard()
+ userCard.cardType = "00";
+ nfcWreatHelper.writeUserDataAsync(userCard, object : NFCCallBack {
+ override fun isSusses(flag: Boolean, msg: String?) {
+ // 纭繚Toast鍦ㄤ富绾跨▼涓皟鐢�
+ runOnUiThread {
+ if (flag) {
+ postCardData(cardAddr)
+ } else {
+ ToastUtil.show("閿�鍗″啓鍗″け璐�: ${msg ?: "鏈煡閿欒"}")
+ }
+ }
+ }
+ })
+ }
+
CardOperationType.CheckCard -> TODO()
CardOperationType.DeductCard -> TODO()
CardOperationType.ReplaceCard -> TODO()
@@ -210,7 +271,7 @@
val updatedCardRegistration = cardRegistration.copy(isCardWritten = true)
// 鏇存柊鏁版嵁搴撹褰�
cardRegistrationDao.update(updatedCardRegistration)
-
+
// 鍦ㄤ富绾跨▼涓叧闂瑼ctivity
runOnUiThread {
setResult(RESULT_OK)
@@ -231,12 +292,8 @@
}
}
- fun postCardData(cardType: String, cardAddr: String) {
- when (cardType) {
- CardCommon.CHECK_CARD -> {
- binding?.cardData?.text = "鍐欑敤鎴峰崱"
- }
- }
+ fun postCardData(cardAddr: String) {
+
val map = mutableMapOf<String, Any>()
if (cardAddr.isNotEmpty()) {
@@ -256,10 +313,7 @@
object : SubscriberListener<BaseResponse<String>>() {
override fun onNext(t: BaseResponse<String>) {
if (t.success) {
-
updateCardWrittenStatus(cardAddr)
-
-
} else {
// 澶勭悊鎼滅储澶辫触鐨勬儏鍐�
ToastUtil.show(t.msg)
--
Gitblit v1.8.0