From 420562c180324d5cc22bb8bec0fe040c304eca03 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 12 七月 2024 15:29:13 +0800
Subject: [PATCH] 齐河单机版充值逻辑调整由水费计价改为电费计价
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java | 11 +++++------
1 files changed, 5 insertions(+), 6 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..ea81f0d 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
@@ -197,8 +197,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 {
@@ -368,7 +368,6 @@
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");
@@ -417,8 +416,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 +435,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