From ea8b02bbc2d20dc3db5b045fac4e6ddff7f44b7c Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期日, 29 九月 2024 10:30:10 +0800
Subject: [PATCH] 优化NFC模块架构，将一些方法抽调到父类中。修复一些bug
---
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/dbBean/RechargeBean.java | 196 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 144 insertions(+), 52 deletions(-)
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/dbBean/RechargeBean.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/dbBean/RechargeBean.java
index a5740d1..f789bfa 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/dbBean/RechargeBean.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/dbBean/RechargeBean.java
@@ -3,6 +3,8 @@
import androidx.room.Entity;
import androidx.room.PrimaryKey;
+import java.io.Serializable;
+
/**
* Copyright (C), 2023,
* Author: zuo
@@ -10,38 +12,64 @@
* Description: 鍏呭�煎疄浣撶被
*/
@Entity
-public class RechargeBean {
+public class RechargeBean implements Serializable {
@PrimaryKey(autoGenerate = true)
public long id;
+
+ public String cardNumber;//鍗″彿锛堝疄浣撳崱鍙凤級
+ private String userCode;//鍏呭�兼満鐢熸垚鐨勭敤鎴风紪鍙�
+ private String userName;
+ private String personId;//鏈嶅姟鍣ㄨ繑鍥炵殑鐢ㄦ埛id
private String serial;//璁惧搴忓垪鍙�
- public String userName;
- public String userId;//鐢ㄦ埛韬唤璇佸彿
- public long date;
- public String morny;//鍏呭�奸噾棰� 鍗曚綅鍏�
- public String rechargeWater;//鍏呭�兼按閲�
- public String balance;//浣欓 鍗曚綅鍏�
- public String total_morn;//鎬诲厖鍊奸噾棰�
+ private String arerNumber;//鍖哄煙鍙�
+ private String morny;//鍏呭�奸噾棰� 鍗曚綅鍏�
+ private String balance;//浣欓 鍗曚綅鍏�
+ private String rechargeElectric;//鍏呭�肩數閲�
+
+ private String price;//鐢靛崟浠�
+
+ private String surplusElectic;//鍓╀綑鐢甸噺
+ private long rechargeDate;//鍏呭�兼椂闂�
+
+ private String userId;//鐢ㄦ埛韬唤璇佸彿
+
+ private String rechargeWater;//鍏呭�兼按閲�
+
+ private String totalMorny;//鎬诲厖鍊奸噾棰�
//鐘舵�� 0鏈笂浼� 1鎴愬姛涓婁紶
- public int state = 0;
+ private int state = 0;
- public String cardNumber;//鍗″彿
- public String surplusWater;//鍓╀綑姘撮噺 搴曚綅鍦ㄥ墠 2浣嶅皬鏁扮偣銆�鍗曚綅鍏�/绔嬫柟绫� ()
+ private String surplusWater;//鍓╀綑姘撮噺 搴曚綅鍦ㄥ墠 2浣嶅皬鏁扮偣銆�鍗曚綅鍏�/绔嬫柟绫� ()
- public String getRechargeWater() {
- return rechargeWater;
+ private String orderId;//鍏呭�艰鍗曞彿
+
+ private String deductionMorny;//琛ユ墸閽辨 鍏呭�艰ˉ鎵ｉ噾棰�=鍏呭�奸噾棰�+鍏呭�煎墠璇诲彇鐨勫崱鍐呬綑棰�-鍏呭�煎洖璋冭繑鍥炲崱鍐呬綑棰�
+
+ private String adminId;//褰撳墠鐧诲綍鐨勭敤鎴穒d
+
+ public String getAdminId() {
+ return adminId;
}
- public void setRechargeWater(String rechargeWater) {
- this.rechargeWater = rechargeWater;
+ public void setAdminId(String adminId) {
+ this.adminId = adminId;
}
- public String getSurplusWater() {
- return surplusWater;
+ public String getDeductionMorny() {
+ return deductionMorny;
}
- public void setSurplusWater(String surplusWater) {
- this.surplusWater = surplusWater;
+ public void setDeductionMorny(String deductionMorny) {
+ this.deductionMorny = deductionMorny;
+ }
+
+ public String getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(String orderId) {
+ this.orderId = orderId;
}
public String getCardNumber() {
@@ -52,36 +80,12 @@
this.cardNumber = cardNumber;
}
- public String getTotal_morn() {
- return total_morn;
+ public String getUserCode() {
+ return userCode;
}
- public String getUserId() {
- return userId;
- }
-
- public void setUserId(String userId) {
- this.userId = userId;
- }
-
- public void setTotal_morn(String total_morn) {
- this.total_morn = total_morn;
- }
-
- public int getState() {
- return state;
- }
-
- public void setState(int state) {
- this.state = state;
- }
-
- public String getSerial() {
- return serial;
- }
-
- public void setSerial(String serial) {
- this.serial = serial;
+ public void setUserCode(String userCode) {
+ this.userCode = userCode;
}
public String getUserName() {
@@ -92,13 +96,28 @@
this.userName = userName;
}
-
- public long getDate() {
- return date;
+ public String getPersonId() {
+ return personId;
}
- public void setDate(long date) {
- this.date = date;
+ public void setPersonId(String personId) {
+ this.personId = personId;
+ }
+
+ public String getSerial() {
+ return serial;
+ }
+
+ public void setSerial(String serial) {
+ this.serial = serial;
+ }
+
+ public String getArerNumber() {
+ return arerNumber;
+ }
+
+ public void setArerNumber(String arerNumber) {
+ this.arerNumber = arerNumber;
}
public String getMorny() {
@@ -116,4 +135,77 @@
public void setBalance(String balance) {
this.balance = balance;
}
+
+ public String getRechargeElectric() {
+ return rechargeElectric;
+ }
+
+ public void setRechargeElectric(String rechargeElectric) {
+ this.rechargeElectric = rechargeElectric;
+ }
+
+ public String getPrice() {
+ return price;
+ }
+
+ public void setPrice(String price) {
+ this.price = price;
+ }
+
+ public String getSurplusElectic() {
+ return surplusElectic;
+ }
+
+ public void setSurplusElectic(String surplusElectic) {
+ this.surplusElectic = surplusElectic;
+ }
+
+ public long getRechargeDate() {
+ return rechargeDate;
+ }
+
+ public void setRechargeDate(long rechargeDate) {
+ this.rechargeDate = rechargeDate;
+ }
+
+ public String getUserId() {
+ return userId;
+ }
+
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+
+ public String getRechargeWater() {
+ return rechargeWater;
+ }
+
+ public void setRechargeWater(String rechargeWater) {
+ this.rechargeWater = rechargeWater;
+ }
+
+
+ public String getTotalMorny() {
+ return totalMorny;
+ }
+
+ public void setTotalMorny(String totalMorny) {
+ this.totalMorny = totalMorny;
+ }
+
+ public int getState() {
+ return state;
+ }
+
+ public void setState(int state) {
+ this.state = state;
+ }
+
+ public String getSurplusWater() {
+ return surplusWater;
+ }
+
+ public void setSurplusWater(String surplusWater) {
+ this.surplusWater = surplusWater;
+ }
}
--
Gitblit v1.8.0