From 8b0dd174285faed9afdd7341a177df4e60d98192 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 25 八月 2023 01:56:25 +0800
Subject: [PATCH] 优化代码

---
 java110-bean/src/main/java/com/java110/dto/fee/FeeDetailDto.java |   73 ++++++++++++++++++++++++++++++++++--
 1 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/fee/FeeDetailDto.java b/java110-bean/src/main/java/com/java110/dto/fee/FeeDetailDto.java
index c5def88..1719840 100755
--- a/java110-bean/src/main/java/com/java110/dto/fee/FeeDetailDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/fee/FeeDetailDto.java
@@ -1,8 +1,7 @@
 package com.java110.dto.fee;
 
 import com.java110.dto.PageDto;
-import com.java110.dto.feeAccountDetail.FeeAccountDetailDto;
-import com.java110.dto.payFeeDetailDiscount.PayFeeDetailDiscountDto;
+import com.java110.dto.payFee.PayFeeDetailDiscountDto;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -29,7 +28,7 @@
     public static final String STATE_RETURN_ERROR = "1200";
     public static final String STATE_RETURN_ORDER = "1300";
     public static final String STATE_NORMAL = "1400";
-
+    public static final String STATE_OWE = "1500"; // 娆犺垂
     /**
      * 1000	閫�璐逛腑
      * 1100	宸查��璐�
@@ -44,10 +43,12 @@
     private String cycles;
     private String remark;
     private String receivedAmount;
+    private String payableAmount;
     private String communityId;
     private String feeId;
     private String bId;
     private String payerObjId;
+    private String payerObjName;
     private String payerObjType;
 
     private Date createTime;
@@ -70,12 +71,21 @@
     private String ardId;
     private String[] states;
 
+    private String payOrderId;
+
+    private String cashierId;
+    private String cashierName;
+
     private List<FeeAccountDetailDto> feeAccountDetailDtoList;
     private List<PayFeeDetailDiscountDto> payFeeDetailDiscountDtoList;
 
     private String fadState;
     private String fadStateName;
     private String amount;
+
+    private String primeRateName;
+
+    private String feeFlag;
 
     public String getPrimeRate() {
         return primeRate;
@@ -140,7 +150,6 @@
     public void setFeeId(String feeId) {
         this.feeId = feeId;
     }
-
 
     public Date getCreateTime() {
         return createTime;
@@ -341,4 +350,60 @@
     public void setPayFeeDetailDiscountDtoList(List<PayFeeDetailDiscountDto> payFeeDetailDiscountDtoList) {
         this.payFeeDetailDiscountDtoList = payFeeDetailDiscountDtoList;
     }
+
+    public String getPayableAmount() {
+        return payableAmount;
+    }
+
+    public void setPayableAmount(String payableAmount) {
+        this.payableAmount = payableAmount;
+    }
+
+    public String getPayOrderId() {
+        return payOrderId;
+    }
+
+    public void setPayOrderId(String payOrderId) {
+        this.payOrderId = payOrderId;
+    }
+
+    public String getPrimeRateName() {
+        return primeRateName;
+    }
+
+    public void setPrimeRateName(String primeRateName) {
+        this.primeRateName = primeRateName;
+    }
+
+    public String getPayerObjName() {
+        return payerObjName;
+    }
+
+    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;
+    }
 }

--
Gitblit v1.8.0