From 3673328730251736f9614793d9a75630c17b28f6 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 13 八月 2024 09:10:27 +0800
Subject: [PATCH] 修改未关泵补卡逻辑
---
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NFCWreatActivity.java | 65 +++++++++++++++++---------------
1 files changed, 34 insertions(+), 31 deletions(-)
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NFCWreatActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NFCWreatActivity.java
index c86b591..f066485 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NFCWreatActivity.java
+++ b/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) {
- }
- }
}
\ No newline at end of file
--
Gitblit v1.8.0