齐河单机版充值逻辑调整由水费计价改为电费计价

zuoxiao

2024-07-12 420562c180324d5cc22bb8bec0fe040c304eca03

 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);