feat(card): 优化销卡功能并添加写卡操作

zuoxiao

15 小时以前 465c8abaa982fba6868a900d25316c70afc20fb7

 generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt

@@ -36,6 +36,10 @@
    private var rechargeAmount = 0.0
    private var bonusAmount = 0.0

    // 销卡相关信息
    private var refundAmount = 0.0
    private var cardBalance = 0.0

    //订单编号
    var orderNumber = ""
    private lateinit var userCard: UserCard
@@ -63,6 +67,10 @@
        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
        }
@@ -77,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 -> {
@@ -126,7 +154,14 @@
                    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()
@@ -151,7 +186,7 @@
                        // 确保Toast在主线程中调用
                        runOnUiThread {
                            if (success) {
                                postCardData(cardType, cardAddr)
                                postCardData(cardAddr)
                                ToastUtil.show("写卡成功!")
                            } else {
                                // 处理写卡失败的情况
@@ -167,7 +202,7 @@
                            // 确保Toast在主线程中调用
                            runOnUiThread {
                                if (flag) {
                                    postCardData(cardType, cardAddr)
                                    postCardData(cardAddr)

                                } else {
                                    ToastUtil.show("写卡失败: ${msg ?: "未知错误"}")
@@ -184,8 +219,7 @@
                            // 确保Toast在主线程中调用
                            runOnUiThread {
                                if (flag) {
                                    postCardData(cardType, cardAddr)
                                    ToastUtil.show("充值写卡成功!")
                                    postCardData(cardAddr)
                                } else {
                                    ToastUtil.show("充值写卡失败: ${msg ?: "未知错误"}")
                                }
@@ -194,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()
@@ -242,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()) {
@@ -267,10 +313,7 @@
            object : SubscriberListener<BaseResponse<String>>() {
                override fun onNext(t: BaseResponse<String>) {
                    if (t.success) {

                        updateCardWrittenStatus(cardAddr)


                    } else {
                        // 处理搜索失败的情况
                        ToastUtil.show(t.msg)