添加齐河项目的卡结构

zuoxiao

2024-02-29 1c549ae7af5f8d7bdeecb4ad38ab181af4831821

 app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java

@@ -168,7 +168,7 @@
                userName = this.getIntent().getStringExtra("userName");
                binding.cardData.setText("充值金额：" + morny + "元");
                // 充值逻辑
                recharge(userCard.getInitPeasantCode(), userName, "启用");
//                recharge(userCard.getInitPeasantCode(), userName, "启用");
            }

            try {
@@ -373,26 +373,26 @@
                        String state = BcdUtil.bcdToStr(readData.getBodyBytes()[2]);
                        //00启用01禁用02隶属信息不符03无此卡信息04其它
                        if ("00".equalsIgnoreCase(state)) {
                            rechargeIsOk = true;
                            binding.cardData.setText("充值通信完成，请帖卡充值");
                            rechargeBean = new RechargeBean();
                            rechargeBean.setDate(System.currentTimeMillis());
                            rechargeBean.setMorny(morny);
                            rechargeBean.setUserName(name);

                            rechargeBean.setSerial(adminData.getSerial());
                            userCard.setRechargeDate(Calendar.getInstance());
                            rechargeBean.setBalance(MornyUtil.changeF2Y(balance));
                            rechargeBean.setInitPeasantCode(initPeasantCode);
                            rechargeBean.setOrderID(orderId);
                            try {
                                baseDao.rechargeDao().insert(rechargeBean);
                            } catch (Exception e) {
                                e.printStackTrace();
                            }
                            userCard.setRechargeTimes(userCard.getRechargeTimes() + 1);
//                            rechargeIsOk = true;
//                            binding.cardData.setText("充值通信完成，请帖卡充值");
//                            rechargeBean = new RechargeBean();
//                            rechargeBean.setDate(System.currentTimeMillis());
//                            rechargeBean.setMorny(morny);
//                            rechargeBean.setUserName(name);
//
//                            rechargeBean.setSerial(adminData.getSerial());
//                            userCard.setRechargeDate(Calendar.getInstance());
//                            rechargeBean.setBalance(MornyUtil.changeF2Y(balance));
//                            rechargeBean.setInitPeasantCode(initPeasantCode);
//                            rechargeBean.setOrderID(orderId);
//                            try {
//                                baseDao.rechargeDao().insert(rechargeBean);
//                            } catch (Exception e) {
//                                e.printStackTrace();
//                            }
//                            userCard.setRechargeTimes(userCard.getRechargeTimes() + 1);
                        } else if ("01".equalsIgnoreCase(state)) {
                            userCard.setState("01");
//                            userCard.setState("01");
                            userFlag = WriteCardUtils.setUser(intent, userCard, NFCWreatActivity.this);
                            NFCWreatActivity.this.finish();
                            TipUtil.show("充值报文错误-禁用");
@@ -432,19 +432,19 @@
        UserCard userCardold = NfcReadHelper.getInstence(intent, this).getUserCardData();
        if (userCardold != null) {
            //判断是否充值的是一个卡
            if (userCard.getInitPeasantCode().equals(userCardold.getInitPeasantCode())) {
                userCard.setState("00");
                userFlag = WriteCardUtils.setUser(intent, userCard, this);
                //   打印相关
                if (userFlag) {
                    setPrinterData(rechargeBean);
                    startDetailActivity(userName, "启用");
                } else {
                    TipUtil.show(NFCWreatActivity.this, "写卡失败，请重新再试");
                }
            } else {
                TipUtil.show(NFCWreatActivity.this, "读取的卡和充值的卡不一致");
            }
//            if (userCard.getInitPeasantCode().equals(userCardold.getInitPeasantCode())) {
//                userCard.setState("00");
//                userFlag = WriteCardUtils.setUser(intent, userCard, this);
//                //   打印相关
//                if (userFlag) {
//                    setPrinterData(rechargeBean);
//                    startDetailActivity(userName, "启用");
//                } else {
//                    TipUtil.show(NFCWreatActivity.this, "写卡失败，请重新再试");
//                }
//            } else {
//                TipUtil.show(NFCWreatActivity.this, "读取的卡和充值的卡不一致");
//            }
        } else {

        }
@@ -570,19 +570,19 @@
                            String state = BcdUtil.bcdToStr(readData.getBodyBytes()[2]);  //BCD码00启用 01禁用 02隶属信息不符 03无此卡信息 04其它s
                            if (userCard == null) {
                                userCard = new UserCard();
                                userCard.setRechargeTimes(0);
                                ElectricPriceBean electricPriceBean = baseDao.electricPriceDao().findFirst();
                                if (electricPriceBean != null) {
                                    userCard.setElectricityPrice(electricPriceBean.getPrice());
                                } else {
                                    //默认是1元
                                    userCard.setElectricityPrice(1.000f);
                                }
                                userCard.setSwipeNumber((short) 0);
                                userCard.setState("00");
                                userCard.setBalance(0);
                                userCard.setAddressCode(adminData.getAddressCode());
                                userCard.setInitPeasantCode(initPeasantCode);
//                                userCard.setRechargeTimes(0);
//                                ElectricPriceBean electricPriceBean = baseDao.electricPriceDao().findFirst();
//                                if (electricPriceBean != null) {
//                                    userCard.setElectricityPrice(electricPriceBean.getPrice());
//                                } else {
//                                    //默认是1元
//                                    userCard.setElectricityPrice(1.000f);
//                                }
//                                userCard.setSwipeNumber((short) 0);
//                                userCard.setState("00");
//                                userCard.setBalance(0);
//                                userCard.setAddressCode(adminData.getAddressCode());
//                                userCard.setInitPeasantCode(initPeasantCode);
                            }
                            //只有启动状态才能充值
                            //金额
@@ -593,8 +593,8 @@
                            String name = SocketUtil.fromHexString(SocketUtil.bytesToHexClean0(nameByte));
                            if ("00".equals(state)) {
                                stateText.append("启用");
                                userCard.setBalance(balance);
                                userCard.setState("00");
//                                userCard.setBalance(balance);
//                                userCard.setState("00");
                                //补卡逻辑
                                userFlag = WriteCardUtils.setUser(intent, userCard, NFCWreatActivity.this);
                                if (userFlag) {
@@ -608,8 +608,8 @@
                                return;
                            } else if ("01".equals(state)) {
                                stateText.append("禁用");
                                userCard.setState("01");
                                userCard.setBalance(balance);
//                                userCard.setState("01");
//                                userCard.setBalance(balance);
                                userFlag = WriteCardUtils.setUser(intent, userCard, NFCWreatActivity.this);
                                startDetailActivity(name, stateText.toString());