合并0819

chengf

2025-08-19 3066c7757f70878e8c495421de5de33e0f612fba

 java110-bean/src/main/java/com/java110/vo/api/ApiFeeDetailDataVo.java

@@ -1,7 +1,7 @@
package com.java110.vo.api;

import com.java110.dto.feeAccountDetail.FeeAccountDetailDto;
import com.java110.dto.payFeeDetailDiscount.PayFeeDetailDiscountDto;
import com.java110.dto.fee.FeeAccountDetailDto;
import com.java110.dto.payFee.PayFeeDetailDiscountDto;
import com.java110.vo.Vo;

import java.util.Date;
@@ -37,6 +37,9 @@
    private Date preReadingTime;
    private Date curReadingTime;

    private String cashierId;
    private String cashierName;

    private List<FeeAccountDetailDto> feeAccountDetailDtoList;
    private List<PayFeeDetailDiscountDto> payFeeDetailDiscountDtoList;

@@ -48,6 +51,35 @@

    private String payerObjName;

    private String feeFlag;

    private String receiptCode;

    private String note;


    private String openInvoice; // todo 默认 未开票

    private String acctAmount;
    private String discountAmount;
    private String deductionAmount;
    private String lateAmount;
    private String giftAmount;
    //发票号
    private String invoiceNo;
    //收据号
    private String receiptNo;

    public String getReceiptNo() {
        return receiptNo;
    }

    public void setReceiptNo(String receiptNo) {
        this.receiptNo = receiptNo;
    }

    //转账人
    private String transferorName;

    public String getPrimeRate() {
        return primeRate;
@@ -248,4 +280,108 @@
    public void setPayerObjName(String payerObjName) {
        this.payerObjName = payerObjName;
    }

    public String getCashierId() {
        return cashierId;
    }

    public void setCashierId(String cashierId) {
        this.cashierId = cashierId;
    }

    public String getCashierName() {
        return cashierName;
    }

    public void setCashierName(String cashierName) {
        this.cashierName = cashierName;
    }

    public String getFeeFlag() {
        return feeFlag;
    }

    public void setFeeFlag(String feeFlag) {
        this.feeFlag = feeFlag;
    }

    public String getReceiptCode() {
        return receiptCode;
    }

    public void setReceiptCode(String receiptCode) {
        this.receiptCode = receiptCode;
    }

    public String getNote() {
        return note;
    }

    public void setNote(String note) {
        this.note = note;
    }

    public String getOpenInvoice() {
        return openInvoice;
    }

    public void setOpenInvoice(String openInvoice) {
        this.openInvoice = openInvoice;
    }

    public String getAcctAmount() {
        return acctAmount;
    }

    public void setAcctAmount(String acctAmount) {
        this.acctAmount = acctAmount;
    }

    public String getDiscountAmount() {
        return discountAmount;
    }

    public void setDiscountAmount(String discountAmount) {
        this.discountAmount = discountAmount;
    }

    public String getDeductionAmount() {
        return deductionAmount;
    }

    public void setDeductionAmount(String deductionAmount) {
        this.deductionAmount = deductionAmount;
    }

    public String getLateAmount() {
        return lateAmount;
    }

    public void setLateAmount(String lateAmount) {
        this.lateAmount = lateAmount;
    }

    public String getGiftAmount() {
        return giftAmount;
    }

    public void setGiftAmount(String giftAmount) {
        this.giftAmount = giftAmount;
    }

    public String getInvoiceNo() {
        return invoiceNo;
    }

    public void setInvoiceNo(String invoiceNo) {
        this.invoiceNo = invoiceNo;
    }

    public String getTransferorName() {
        return transferorName;
    }

    public void setTransferorName(String transferorName) {
        this.transferorName = transferorName;
    }
}