From 0faae97cd2523f840c426da68464e577e01dfa80 Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期一, 23 六月 2025 20:35:08 +0800
Subject: [PATCH] refactor(CardReplaceActivity): 重构补卡流程并优化界面显示- 重新设计卡片信息展示布局，增加新卡卡地址、客户编号等字段 - 优化补卡逻辑，支持通过卡号或客户编号获取卡片信息 -调整工本费和返回金额输入框位置 - 更新API调用路径，使用新的卡片查询接口
---
generallibrary/src/main/java/com/dayu/general/activity/SearchCardListActivity.kt | 54 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/generallibrary/src/main/java/com/dayu/general/activity/SearchCardListActivity.kt b/generallibrary/src/main/java/com/dayu/general/activity/SearchCardListActivity.kt
index 58f452c..8139100 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/SearchCardListActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/SearchCardListActivity.kt
@@ -90,9 +90,9 @@
card.cardNum.toString(),
card.money.toString()
)
- refundDialog.setOnConfirmListener { refundAmount, remark ->
- // TODO: 澶勭悊閫�娆鹃�昏緫
- lossPost(card.idCard.toString())
+ refundDialog.setOnConfirmListener { _username, cardNumber, balance, refundAmount, remark ->
+ // 璋冪敤鎸傚け鎺ュ彛
+ lossPost(cardNumber, balance, refundAmount, remark)
}
}
@@ -217,38 +217,56 @@
)
}
-
- private fun lossPost(cardNumber: String) {
+ /**
+ * 鎵ц鎸傚け鎿嶄綔
+ * @param cardNumber 鍗″彿
+ * @param balance 浣欓
+ * @param refundAmount 閫�娆鹃噾棰�
+ * @param remark 澶囨敞
+ */
+ private fun lossPost(cardNumber: String, balance: String, refundAmount: String, remark: String) {
val map = mutableMapOf<String, Any>()
map["cardNum"] = cardNumber
+
+ // 澶勭悊浣欓鏍煎紡锛屽幓闄ゅ崈浣嶅垎闅旂閫楀彿鍜�"鍏�"瀛楃
+ val balanceValue = balance.replace("鍏�", "").replace(",", "").toFloatOrNull() ?: 0f
+ map["money"] = balanceValue
+
+ map["refund"] = refundAmount.toFloatOrNull() ?: 0f
+ map["remarks"] = remark.ifEmpty { "鎸傚け" }
map["operator"] = BaseApplication.userId
- ApiManager.getInstance().requestGetLoading(
+
+ ApiManager.getInstance().requestPostLoading(
this,
- "/sell/card/loss",
- SearchCardResult::class.java,
+ "sell/card/loss",
+ ReportLossResult::class.java,
map,
- object : SubscriberListener<BaseResponse<SearchCardResult>>() {
- override fun onNext(t: BaseResponse<SearchCardResult>) {
-
-
- if (t.success) {
-
+ object : SubscriberListener<BaseResponse<ReportLossResult>>() {
+ override fun onNext(t: BaseResponse<ReportLossResult>) {
+ if (t.success && t.code == "0001") {
+ ToastUtil.show("鎸傚け鎴愬姛")
+ // 鍒锋柊鍒楄〃鏁版嵁
+ searchCards(currentFarmerId, currentFarmerName, currentCardNumber, true)
} else {
- // 澶勭悊鎼滅储澶辫触鐨勬儏鍐�
- ToastUtil.show(t.msg)
+ ToastUtil.show(t.msg ?: "鎸傚け澶辫触")
}
}
override fun onError(e: Throwable?) {
super.onError(e)
- // 瀹屾垚鍒锋柊鎴栧姞杞藉姩浣�
- ToastUtil.show("鎼滅储澶辫触: ${e?.message ?: "鏈煡閿欒"}")
+ ToastUtil.show("鎸傚け澶辫触: ${e?.message ?: "缃戠粶閿欒"}")
}
}
)
}
+ /**
+ * 鎸傚け鎺ュ彛杩斿洖缁撴灉
+ */
+ data class ReportLossResult(
+ val content: Boolean? = null
+ )
/**
* 瀹屾垚鍒锋柊鎴栧姞杞芥搷浣�
--
Gitblit v1.8.0