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 | 76 ++++++++++++++++++++++++--------------
1 files changed, 48 insertions(+), 28 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 9db5b53..93e786e 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeDetailActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeDetailActivity.java
@@ -8,6 +8,9 @@
import com.dayu.baselibrary.utils.MornyUtil;
import com.dayu.qiheonlinelibrary.card.UserCard;
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;
@@ -24,10 +27,9 @@
ActivityRechargeDetailQhlBinding binding;
UserCard userCard;
String statu;
- String userName;
String morny;
- String rechageWater;
- String cardNumber;
+ UserCardBean userCardBean;
+ RechargeBean rechargeBean;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -37,54 +39,72 @@
setContentView(binding.getRoot());
try {
- userCard = (UserCard) getIntent().getSerializableExtra("userCard");
- statu = getIntent().getStringExtra("statu");
- userName = getIntent().getStringExtra("userName");
- if (getIntent().hasExtra("morny")) {
- morny = getIntent().getStringExtra("morny");
- rechageWater = getIntent().getStringExtra("rechageWater");
+ if (getIntent().hasExtra("userCard")) {
+ userCard = (UserCard) getIntent().getSerializableExtra("userCard");
}
- if (getIntent().hasExtra("cardNumber")) {
- cardNumber = getIntent().getStringExtra("cardNumber");
+ if (getIntent().hasExtra("statu")) {
+ statu = getIntent().getStringExtra("statu");
}
- setUserData(userName, statu);
+ if (getIntent().hasExtra("rechargeBean")) {
+ rechargeBean = (RechargeBean) getIntent().getSerializableExtra("rechargeBean");
+ }
+ if (getIntent().hasExtra("userCardBean")) {
+ userCardBean = (UserCardBean) getIntent().getSerializableExtra("userCardBean");
+ }
+ setUserData(statu);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
- private void setUserData(String userName, String statu) {
- int balance = userCard.getBalance();
- if (!TextUtils.isEmpty(morny)) {
+ private void setUserData(String statu) {
+
+ if (rechargeBean != null) {
binding.tip.setText("鍏呭�兼垚鍔燂紒");
- balance = userCard.getBalance();
- binding.redRemainderMorny.setText("鍏呭�奸噾棰濓細" + morny + " 鍏�");
- binding.redRechargeWater.setText("鍓╀綑閲戦锛�" + MornyUtil.changeF2Y(balance) + " 鍏�");
+ binding.redName.setText("濮撳悕锛�" + rechargeBean.getUserName());
+ 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("寮�鍗℃垚鍔燂紒");
- balance = userCard.getBalance();
+ binding.redInitCode.setText("鍗″彿锛�" + userCardBean.getCardNumber());
+ binding.redUserCode.setText("鐢ㄦ埛缂栧彿锛�" + userCardBean.getUserCode());
binding.redRemainderMorny.setVisibility(View.GONE);
- binding.redRechargeWater.setVisibility(View.GONE);
+ binding.redRechargeBalance.setVisibility(View.GONE);
+ binding.redRechargeElectric.setVisibility(View.GONE);
+ binding.redSurplusElectric.setVisibility(View.GONE);
+ binding.redDeductionMorny.setVisibility(View.GONE);
}
- binding.redName.setText("鐢ㄦ埛濮撳悕锛�" + userName);
-// binding.redRemainderBlance.setText("鍓╀綑閲戦锛�" + MornyUtil.changeF2Y(balance) + " 鍏�");
- binding.redSurplusWater.setText("鍓╀綑姘撮噺锛�" + MornyUtil.changeF2Y(userCard.getSurplusWater()) + " 鍚�");
- binding.redStatu.setText("鍗＄姸鎬侊細" + statu);
+ if (TextUtils.isEmpty(statu)) {
+ binding.redStatu.setVisibility(View.GONE);
+ } else {
+ binding.redStatu.setText("鍗＄姸鎬侊細" + statu);
+ }
if (userCard != null) {
- binding.redInitCode.setText("褰撳墠鍗″彿锛�" + cardNumber);
Calendar calendar = userCard.getRechargeDate();
if (calendar != null) {
int year = calendar.get(Calendar.YEAR);
int month = calendar.get(Calendar.MONTH); // 鏈堜唤浠�0寮�濮嬶紝鎵�浠ラ渶瑕佸姞1
int day = calendar.get(Calendar.DAY_OF_MONTH);
-
binding.redRechargeDate.setText("鏈崱鏈�鍚庤喘姘存棩鏈燂細" + year + month + day);
} else {
binding.redRechargeDate.setText("鏈崱鏈�鍚庤喘姘存棩鏈燂細鏃�");
}
-
-// binding.redRechargeNumber.setText("鏈崱鍏呭�兼鏁帮細" + userCard.getRechargeTimes() + "");
}
}
}
--
Gitblit v1.8.0