修改未关泵补卡逻辑

zuoxiao

2024-08-13 3673328730251736f9614793d9a75630c17b28f6

 qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NFCWreatActivity.java

@@ -28,6 +28,7 @@
import com.dayu.qiheonlinelibrary.card.DomainCard;
import com.dayu.qiheonlinelibrary.card.ElectricPriceCard;
import com.dayu.qiheonlinelibrary.card.ManageCard;
import com.dayu.qiheonlinelibrary.card.ManagerToUserCard;
import com.dayu.qiheonlinelibrary.card.PassWordCard;
import com.dayu.qiheonlinelibrary.card.RegionCard;
import com.dayu.qiheonlinelibrary.card.RegisteredCard;
@@ -119,6 +120,7 @@
    //补卡工本费用
    String rechargeCardMoney;
    ReplacementPriceDialog replacementPriceDialog;
    ManagerToUserCard managerToUserCard;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
@@ -210,6 +212,7 @@
            }
            if (this.getIntent().hasExtra("iccardInfoId")) {
                iccardInfoId = this.getIntent().getStringExtra("iccardInfoId");
                //补卡类型
                replaceType = this.getIntent().getIntExtra("replaceType", 0);
                replacementPriceDialog = new ReplacementPriceDialog(this, data -> {
                    if (TextUtils.isEmpty(data)) {
@@ -373,11 +376,14 @@
            if (rechargeBean != null) {
                data.append("*****************************" + "\n");
                data.append("设备序列号：" + rechargeBean.getSerial() + "\n");
                data.append("用户名：" + rechargeBean.getUserName() + "\n");
                data.append("卡  号：" + rechargeBean.getCardNumber() + "\n");
                data.append("姓   名：" + rechargeBean.getUserName() + "\n");
                data.append("卡   号：" + rechargeBean.getCardNumber() + "\n");
                data.append("用户编号：" + rechargeBean.getUserCode() + "\n");
                data.append("充值金额：" + rechargeBean.getMorny() + " 元" + "\n");
                data.append("卡内余额：" + rechargeBean.getBalance() + " 元" + "\n");
                data.append("日  期：" + DateUtil.dateToStamp(rechargeBean.getRechargeDate(), DateUtil.type2) + "\n\n");
                data.append("充值电量：" + rechargeBean.getRechargeElectric() + " 度" + "\n");
                data.append("剩余电量：" + rechargeBean.getRechargeElectric() + " 度" + "\n");
                data.append("日   期：" + DateUtil.dateToStamp(rechargeBean.getRechargeDate(), DateUtil.type2) + "\n\n");
                data.append("*****************************");
            }
            float size = 26;
@@ -426,19 +432,16 @@
        }
    }

    private void startDetailActivity(String userName, String statu) {
    private void startDetailActivity(String statu) {
        Intent detail = new Intent(this, RechargeDetailActivity.class);
        detail.putExtra("userName", userName);
        detail.putExtra("statu", statu);
        detail.putExtra("userCard", userCard);
        if (!TextUtils.isEmpty(morny)) {
            detail.putExtra("morny", morny);
            detail.putExtra("rechargeBean", rechargeBean);
        } else {
            detail.putExtra("userCardBean", userCardBean);
        }
        if (!TextUtils.isEmpty(cardNumber)) {
            detail.putExtra("cardNumber", cardNumber);
        }

        startActivity(detail);
        if (NewCardActivity.newCardActivity != null) {
            NewCardActivity.newCardActivity.finish();
@@ -550,7 +553,7 @@
            public void onNext(BaseResponse<LoginResult> t) {
                if (t.isSuccess()) {
                    //{"code":"0","msg":"操作成功","data":{"chargeMethod":"","iccardCancelTime":"","lastRechargeTime":"2024-08-05 17:04:15","thisSaleMoney":"","totalRechargeWaterAmount":0.00,"iccardBalanceAmonunt":0.00,"iccardInfoId":"1820385315354320898","iccardProtocolName":"","totalRechargeElectricAmount":0.00,"logicState":1,"username":"","state":1,"familySize":"","yearRechargeMoney":0.00,"thisSaleAmount":"","onlyRechargeMoney":"","identityCard":"","iccardBrand":"","iccardBalanceMoney":0.00,"openOperatorUsername":"","adName":"","rechargeWaterAmount":"","openOperatorUserId":"1816297106145103873","lastSwipeTime":"","address":"","yearCompensateMoney":0.00,"iccardProtocolOpenMoney":"","peasantId":"1820374742679953410","reissueTimes":0,"iccardProtocolReissueMoney":"","iccardProtocolId":"","yearRechargeWaterAmount":0.00,"iccardBalanceElectric":0.00,"iccardStatus":0,"phone":"","lastRechargeMoney":0.00,"iccardOpenTime":"","yearRechargeElectricAmount":0.00,"reissueRechargeRecordId":"","iccardPrice":1.50,"iccardNum":"3714251023011","accountType":0,"equipCode":"","rechargeWaterMoney":"","totalRechargeMoney":0.00,"executeWaterPrice":"","iccardType":1,"iccardCode":"BADA4044"}}
                    startDetailActivity(userCardBean.getUserName(), "终端写卡");
                    startDetailActivity("终端写卡");
                }
            }
        });
@@ -582,12 +585,28 @@
                    }
                    //   打印相关
                    setPrinterData(rechargeBean);
                    startDetailActivity(rechargeBean.getUserName(), "终端写卡");
                    startDetailActivity("终端写卡");
                }
            }
        });
    }

    /**
     * 补卡逻辑
     */
    private void replaceCard() {
        cardNumber = NfcReadHelper.getInstence(intent, this).getCardNumber();
        if (replaceType == BaseCommon.REPLACE_NO_CARD) {
            replaceCardPost("", "");
        } else if (replaceType == BaseCommon.REPLACE_HAS_CARD) {
            managerToUserCard = NfcReadHelper.getInstence(intent, NFCWreatActivity.this).getManagerToUserCardData();
            //判断是否已经在控制器端刷卡
            if (managerToUserCard.getCardWriteState() == 1) {
                replaceCardPost(MornyUtil.changeF2Y(managerToUserCard.getBalance()), MornyUtil.changeF2Y(managerToUserCard.getSurplusElecticity()));
            } else {
                TipUtil.show("请在控制器端刷卡");
            }
        }
    }

    /**
     * 补卡
@@ -652,29 +671,13 @@
            @Override
            public void onNext(BaseResponse<LoginResult> t) {
                if (t.isSuccess()) {

                    try {
                        baseDao.rechargeDao().insert(rechargeBean);
                    } catch (Exception e) {
                        e.printStackTrace();
                    }
                    //   打印相关
                    setPrinterData(rechargeBean);
                    startDetailActivity(rechargeBean.getUserName(), "终端写卡");
                    TipUtil.show(NFCWreatActivity.this, "补卡成功！", () -> {
                        NFCWreatActivity.this.finish();
                    });
                }
            }
        });
    }

    /**
     * 补卡逻辑
     */
    private void replaceCard() {
        cardNumber = NfcReadHelper.getInstence(intent, this).getCardNumber();
        if (replaceType == BaseCommon.REPLACE_NO_CARD) {
            replaceCardPost("", "");
        } else if (replaceType == BaseCommon.REPLACE_HAS_CARD) {

        }
    }
}