添加补打逻辑 联调修复bug

zuoxiao

2024-08-16 a44c47bc7f37245612635866adaddf5c98d41747

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