修改未关泵补卡逻辑

zuoxiao

2024-08-13 3673328730251736f9614793d9a75630c17b28f6

 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,55 @@
 * 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;//补扣钱款 充值补扣金额=充值金额+充值前读取的卡内余额-充值回调返回卡内余额


    public String getDeductionMorny() {
        return deductionMorny;
    }

    public void setRechargeWater(String rechargeWater) {
        this.rechargeWater = rechargeWater;
    public void setDeductionMorny(String deductionMorny) {
        this.deductionMorny = deductionMorny;
    }

    public String getSurplusWater() {
        return surplusWater;
    public String getOrderId() {
        return orderId;
    }

    public void setSurplusWater(String surplusWater) {
        this.surplusWater = surplusWater;
    public void setOrderId(String orderId) {
        this.orderId = orderId;
    }

    public String getCardNumber() {
@@ -52,36 +71,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 +87,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 +126,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;
    }
}