From a44c47bc7f37245612635866adaddf5c98d41747 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 16 八月 2024 11:03:49 +0800
Subject: [PATCH] 添加补打逻辑 联调修复bug
---
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeDetailActivity.java | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeDetailActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeDetailActivity.java
index b787dc1..93e786e 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeDetailActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeDetailActivity.java
@@ -10,6 +10,7 @@
import com.dayu.qiheonlinelibrary.databinding.ActivityRechargeDetailQhlBinding;
import com.dayu.qiheonlinelibrary.dbBean.RechargeBean;
import com.dayu.qiheonlinelibrary.dbBean.UserCardBean;
+import com.dayu.qiheonlinelibrary.utils.PrintUtils;
import java.util.Calendar;
@@ -38,10 +39,13 @@
setContentView(binding.getRoot());
try {
- userCard = (UserCard) getIntent().getSerializableExtra("userCard");
- statu = getIntent().getStringExtra("statu");
- if (getIntent().hasExtra("morny")) {
- morny = getIntent().getStringExtra("morny");
+ if (getIntent().hasExtra("userCard")) {
+ userCard = (UserCard) getIntent().getSerializableExtra("userCard");
+ }
+ if (getIntent().hasExtra("statu")) {
+ statu = getIntent().getStringExtra("statu");
+ }
+ if (getIntent().hasExtra("rechargeBean")) {
rechargeBean = (RechargeBean) getIntent().getSerializableExtra("rechargeBean");
}
if (getIntent().hasExtra("userCardBean")) {
@@ -55,18 +59,27 @@
}
private void setUserData(String statu) {
- int balance = userCard.getBalance();
- if (!TextUtils.isEmpty(morny)) {
+
+ if (rechargeBean != null) {
binding.tip.setText("鍏呭�兼垚鍔燂紒");
- balance = userCard.getBalance();
binding.redName.setText("濮撳悕锛�" + rechargeBean.getUserName());
- binding.redRemainderMorny.setText("鍏呭�奸噾棰濓細" + morny + " 鍏�");
- binding.redRechargeBalance.setText("鍓╀綑閲戦锛�" + MornyUtil.changeF2Y(balance) + " 鍏�");
+ binding.redRemainderMorny.setText("鍏呭�奸噾棰濓細" + rechargeBean.getMorny() + " 鍏�");
+ binding.redRechargeBalance.setText("鍓╀綑閲戦锛�" + rechargeBean.getBalance() + " 鍏�");
binding.redRechargeElectric.setText("鍏呭�肩數閲忥細" + rechargeBean.getRechargeElectric() + " 搴�");
binding.redSurplusElectric.setText("鍓╀綑鐢甸噺锛�" + rechargeBean.getSurplusElectic() + " 搴�");
binding.redInitCode.setText("鍗″彿锛�" + rechargeBean.getCardNumber());
binding.redUserCode.setText("鐢ㄦ埛缂栧彿锛�" + rechargeBean.getUserCode());
+ if (MornyUtil.changeY2F(rechargeBean.getDeductionMorny()) > 0) {
+ binding.redDeductionMorny.setText("琛ユ墸閲戦锛�" + rechargeBean.getDeductionMorny());
+ } else {
+ binding.redDeductionMorny.setVisibility(View.GONE);
+ }
+ binding.readBtn.setVisibility(View.VISIBLE);
+ binding.readBtn.setOnClickListener(v -> {
+ PrintUtils.printerData(rechargeBean);
+ });
} else {
+ int balance = userCard.getBalance();
binding.redName.setText("濮撳悕锛�" + userCardBean.getUserName());
binding.tip.setText("寮�鍗℃垚鍔燂紒");
binding.redInitCode.setText("鍗″彿锛�" + userCardBean.getCardNumber());
@@ -75,8 +88,13 @@
binding.redRechargeBalance.setVisibility(View.GONE);
binding.redRechargeElectric.setVisibility(View.GONE);
binding.redSurplusElectric.setVisibility(View.GONE);
+ binding.redDeductionMorny.setVisibility(View.GONE);
}
- binding.redStatu.setText("鍗＄姸鎬侊細" + statu);
+ if (TextUtils.isEmpty(statu)) {
+ binding.redStatu.setVisibility(View.GONE);
+ } else {
+ binding.redStatu.setText("鍗＄姸鎬侊細" + statu);
+ }
if (userCard != null) {
Calendar calendar = userCard.getRechargeDate();
if (calendar != null) {
--
Gitblit v1.8.0