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 |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 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 ea81f0d..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")) {
@@ -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);
@@ -372,9 +371,7 @@
                 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("*****************************");
             }

--
Gitblit v1.8.0