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/RechargeActivity.java | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeActivity.java
index 3dc5ce1..2743c68 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeActivity.java
@@ -68,6 +68,8 @@
CardInfoResult cardInfoResult;
+ UserCard mOldUserCard;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -103,6 +105,8 @@
cardNumber = cardType.split(",")[0];
cardType = cardType.split(",")[1];
}
+ //鑾峰彇鍗″唴淇℃伅
+ mOldUserCard = NfcReadHelper.getInstence(intent, this).getUserCardData();
getUserInfoAndCardInfo(cardNumber);
}
@@ -134,6 +138,7 @@
binding.redStatu.setText(state);
binding.redInitCode.setText(cardNumber);
binding.redRechargeDate.setText("鏈崱鏈�鍚庤喘姘存棩鏈燂細\n\n" + lastRechargeTime);
+ binding.redUserCode.setText(cardInfoResult.getIccardCode());
if (userCard != null) {
binding.redRemainderBlance.setText(String.valueOf(iccardBalanceMoney) + " 鍏�");
@@ -220,12 +225,16 @@
private void startNfcActivity(String morny, String balance, float rechargeElectric, float iccardBalanceElectric, float totalMorny, String iccardRechargeRecordId) {
+ //鍏堝鐞嗚ˉ鎵�
+ //鍏呭�艰ˉ鎵ｉ噾棰�=鍏呭�奸噾棰�+鍏呭�煎墠璇诲彇鐨勫崱鍐呬綑棰�-鍏呭�煎洖璋冭繑鍥炲崱鍐呬綑棰�
+ int deductionMorny = MornyUtil.changeY2F(morny) + mOldUserCard.getBalance() - MornyUtil.changeY2F(balance);
+
//娣诲姞鍏呭�间俊鎭�
rechargeBean = new RechargeBean();
rechargeBean.setCardNumber(cardNumber);
- rechargeBean.setUserCode(userCard.getUserCode());
- rechargeBean.setUserName("");
+ rechargeBean.setUserCode(userCard.getUserCode() + userCard.getUserCodeNumber());
+ rechargeBean.setUserName(cardInfoResult.getPeasantName());
rechargeBean.setPersonId(cardInfoResult.getPeasantId());
rechargeBean.setSerial(DeviceUtils.getSN());
rechargeBean.setArerNumber(QHOnLineApplication.getInstance().arerNumber);
@@ -240,6 +249,7 @@
rechargeBean.setTotalMorny(String.valueOf(totalMorny));
rechargeBean.setState(1);
rechargeBean.setOrderId(iccardRechargeRecordId);
+ rechargeBean.setDeductionMorny(MornyUtil.changeF2Y(deductionMorny));
userCard.setCardWriteState(0);
userCard.setCardState(1);
@@ -250,13 +260,26 @@
String sumMorny = MornyUtil.sumPrice(Float.valueOf(MornyUtil.changeF2Y(userCard.getTotalMorny())), Float.valueOf(morny));
userCard.setTotalMorny(MornyUtil.changeY2F(sumMorny));
userCard.setRechargeDate(calendar);
+ userCard.setElectricPrice(Float.valueOf(QHOnLineApplication.getInstance().electriclePriceStr));
+ if (deductionMorny == 0) {
+ Intent intent = new Intent(RechargeActivity.this, NFCWreatActivity.class);
+ intent.putExtra("morny", morny);
+ intent.putExtra("userCard", userCard);
+ intent.putExtra("rechargeBean", rechargeBean);
+ startActivity(intent);
+ } else {
+ TipUtil.show(RechargeActivity.this, "鎸傚け鍗″悗鏈夎ˉ浜ら噾棰濓紒琛ヤ氦閲戦涓猴細" + MornyUtil.changeF2Y(deductionMorny) + "鍏冿紝璇︽儏鍙湪骞冲彴鏌ヨ銆�", new TipUtil.TipListener() {
+ @Override
+ public void onCancle() {
+ Intent intent = new Intent(RechargeActivity.this, NFCWreatActivity.class);
+ intent.putExtra("morny", morny);
+ intent.putExtra("userCard", userCard);
+ intent.putExtra("rechargeBean", rechargeBean);
+ startActivity(intent);
+ }
+ });
+ }
-
- Intent intent = new Intent(RechargeActivity.this, NFCWreatActivity.class);
- intent.putExtra("morny", morny);
- intent.putExtra("userCard", userCard);
- intent.putExtra("rechargeBean", rechargeBean);
- startActivity(intent);
}
--
Gitblit v1.8.0