From 3673328730251736f9614793d9a75630c17b28f6 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 13 八月 2024 09:10:27 +0800
Subject: [PATCH] 修改未关泵补卡逻辑
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
index f1ebcf4..52e0d04 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
@@ -136,7 +136,6 @@
}
if (this.getIntent().hasExtra("electricPriceCard")) {
electricPriceCard = (ElectricPriceCard) this.getIntent().getSerializableExtra("electricPriceCard");
-
binding.cardData.setText("鍒朵綔鐢ㄦ埛鐢甸噺鍗曚环鍗n褰撳墠鍗曚环锛�" + electricPriceCard.getElectricPrice().toString() + " 鍏�");
}
if (this.getIntent().hasExtra("passWordCard")) {
@@ -197,8 +196,8 @@
userName = this.getIntent().getStringExtra("userName");
cardNumber = this.getIntent().getStringExtra("cardNumber");
userCardBean = (UserCardBean) this.getIntent().getSerializableExtra("userCardBean");
- rechageWater = this.getIntent().getStringExtra("rechageWater");
- binding.cardData.setText("鍏呭�奸噾棰濓細" + morny + " 鍏僜n鍏呭�兼按閲忥細" + rechageWater + " 绔嬫柟绫筹紙鍚級");
+// rechageWater = this.getIntent().getStringExtra("rechageWater");
+ binding.cardData.setText("鍏呭�奸噾棰濓細" + morny + " 鍏�");
}
try {
@@ -278,11 +277,11 @@
}
if (manageCard != null) {
setmanageCard(intent, manageCard);
- if (manageCardFlag && userCardBeanByManager != null) {
- //淇敼鐢ㄦ埛琛ㄤ俊鎭慨鏀规垚鏂板崱鍗″彿
- userCardBeanByManager.setCardNumber(cardNumber);
- baseDao.userCardDao().update(userCardBeanByManager);
- }
+// if (manageCardFlag && userCardBeanByManager != null) {
+// //淇敼鐢ㄦ埛琛ㄤ俊鎭慨鏀规垚鏂板崱鍗″彿
+// userCardBeanByManager.setCardNumber(cardNumber);
+// baseDao.userCardDao().update(userCardBeanByManager);
+// }
}
if (registeredCard != null) {
setRegisteredCard(intent, registeredCard);
@@ -368,14 +367,11 @@
StringBuffer data = new StringBuffer();
if (rechargeBean != null) {
data.append("*****************************" + "\n");
- data.append(" 澶х鑺傛按\n 鏅鸿兘鍏呭�肩鐞嗙郴缁�" + "\n");
data.append("璁惧搴忓垪鍙凤細" + rechargeBean.getSerial() + "\n");
data.append("鐢ㄦ埛鍚嶏細" + rechargeBean.getUserName() + "\n");
data.append("鍗� 鍙凤細" + rechargeBean.getCardNumber() + "\n");
data.append("鍏呭�奸噾棰濓細" + rechargeBean.getMorny() + " 鍏�" + "\n");
-// data.append("鍗″唴浣欓锛�" + rechargeBean.getBalance() + " 鍏�" + "\n");
- data.append("鍏呭�兼按閲忥細" + rechargeBean.getRechargeWater() + " 鍚�" + "\n");
- data.append("鍓╀綑姘撮噺锛�" + rechargeBean.getSurplusWater() + " 鍚�" + "\n");
+ data.append("鍗″唴浣欓锛�" + rechargeBean.getBalance() + " 鍏�" + "\n");
data.append("鏃� 鏈燂細" + DateUtil.dateToStamp(rechargeBean.getDate(), DateUtil.type2) + "\n\n");
data.append("*****************************");
}
@@ -417,8 +413,8 @@
int balance = userCard.getBalance() + MornyUtil.changeY2F(morny);
userCard.setBalance(balance);
//鍓╀綑姘撮噺
- int surplusWater = userCard.getSurplusWater() + MornyUtil.changeY2F(rechageWater);
- userCard.setSurplusWater(surplusWater);
+// int surplusWater = userCard.getSurplusWater() + MornyUtil.changeY2F(rechageWater);
+// userCard.setSurplusWater(surplusWater);
int rechageTims = userCard.getRechargeTimes() + 1;
if (rechageTims == 256) {
@@ -436,7 +432,7 @@
rechargeBean.setMorny(morny);
rechargeBean.setBalance(MornyUtil.changeF2Y(balance));
rechargeBean.setCardNumber(cardNumber);
- rechargeBean.setSurplusWater(MornyUtil.changeF2Y(surplusWater));
+ rechargeBean.setSurplusWater(MornyUtil.changeF2Y(0));
rechargeBean.setRechargeWater(rechageWater);
try {
baseDao.rechargeDao().insert(rechargeBean);
--
Gitblit v1.8.0