From 3fc509eab4e928c8e50e024788603002bd03ec63 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 20 一月 2023 11:29:29 +0800
Subject: [PATCH] 优化 ABC问题

---
 java110-bean/src/main/java/com/java110/dto/fee/FeeDetailDto.java |  294 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 270 insertions(+), 24 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
old mode 100644
new mode 100755
index df1e329..8c7cae7
--- 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,9 +1,12 @@
 package com.java110.dto.fee;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.feeAccountDetail.FeeAccountDetailDto;
+import com.java110.dto.payFeeDetailDiscount.PayFeeDetailDiscountDto;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -15,72 +18,131 @@
  **/
 public class FeeDetailDto extends PageDto implements Serializable {
 
-    private String primeRate;
-private String detailId;
-private String receivableAmount;
-private String cycles;
-private String remark;
-private String receivedAmount;
-private String communityId;
-private String feeId;
 
+    public static final String PRIME_REATE_WECHAT_QRCODE = "3";
+    public static final String PRIME_REATE_ALI_QRCODE = "4";
+    public static final String PRIME_REATE_WECHAT = "5";
+    public static final String PRIME_REATE_CRASH = "1";
+    public static final String PRIME_REATE_WECHAT_APP = "6";
+    public static final String STATE_RETURNING = "1000";
+    public static final String STATE_RETURNED = "1100";
+    public static final String STATE_RETURN_ERROR = "1200";
+    public static final String STATE_RETURN_ORDER = "1300";
+    public static final String STATE_NORMAL = "1400";
+
+    /**
+     * 1000	閫�璐逛腑
+     * 1100	宸查��璐�
+     * 1200	閫�璐瑰け璐�
+     * 1300	閫�璐瑰崟
+     * 1400	姝e父
+     */
+
+    private String primeRate;
+    private String detailId;
+    private String receivableAmount;
+    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 payerObjType;
 
     private Date createTime;
     private Date startTime;
     private Date endTime;
 
     private String statusCd = "0";
+    private String state;
+    private String stateName;
+    private String curYear;
+    private String configId;
+    private String feeName;
+    private String importFeeName;
+    private String ownerId;
+    private String curDegrees;
+    private String preDegrees;
 
+    private Date preReadingTime;
+    private Date curReadingTime;
+    private String ardId;
+    private String[] states;
+
+    private String payOrderId;
+
+    private List<FeeAccountDetailDto> feeAccountDetailDtoList;
+    private List<PayFeeDetailDiscountDto> payFeeDetailDiscountDtoList;
+
+    private String fadState;
+    private String fadStateName;
+    private String amount;
 
     public String getPrimeRate() {
         return primeRate;
     }
-public void setPrimeRate(String primeRate) {
+
+    public void setPrimeRate(String primeRate) {
         this.primeRate = primeRate;
     }
-public String getDetailId() {
+
+    public String getDetailId() {
         return detailId;
     }
-public void setDetailId(String detailId) {
+
+    public void setDetailId(String detailId) {
         this.detailId = detailId;
     }
-public String getReceivableAmount() {
+
+    public String getReceivableAmount() {
         return receivableAmount;
     }
-public void setReceivableAmount(String receivableAmount) {
+
+    public void setReceivableAmount(String receivableAmount) {
         this.receivableAmount = receivableAmount;
     }
-public String getCycles() {
+
+    public String getCycles() {
         return cycles;
     }
-public void setCycles(String cycles) {
+
+    public void setCycles(String cycles) {
         this.cycles = cycles;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getReceivedAmount() {
+
+    public String getReceivedAmount() {
         return receivedAmount;
     }
-public void setReceivedAmount(String receivedAmount) {
+
+    public void setReceivedAmount(String receivedAmount) {
         this.receivedAmount = receivedAmount;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getFeeId() {
+
+    public String getFeeId() {
         return feeId;
     }
-public void setFeeId(String feeId) {
+
+    public void setFeeId(String feeId) {
         this.feeId = feeId;
     }
-
 
     public Date getCreateTime() {
         return createTime;
@@ -113,4 +175,188 @@
     public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    public String getbId() {
+        return bId;
+    }
+
+    public void setbId(String bId) {
+        this.bId = bId;
+    }
+
+    public String getPayerObjId() {
+        return payerObjId;
+    }
+
+    public void setPayerObjId(String payerObjId) {
+        this.payerObjId = payerObjId;
+    }
+
+    public String getPayerObjType() {
+        return payerObjType;
+    }
+
+    public void setPayerObjType(String payerObjType) {
+        this.payerObjType = payerObjType;
+    }
+
+    public String getCurYear() {
+        return curYear;
+    }
+
+    public void setCurYear(String curYear) {
+        this.curYear = curYear;
+    }
+
+    public String getConfigId() {
+        return configId;
+    }
+
+    public void setConfigId(String configId) {
+        this.configId = configId;
+    }
+
+    public String getFeeName() {
+        return feeName;
+    }
+
+    public void setFeeName(String feeName) {
+        this.feeName = feeName;
+    }
+
+    public String getImportFeeName() {
+        return importFeeName;
+    }
+
+    public void setImportFeeName(String importFeeName) {
+        this.importFeeName = importFeeName;
+    }
+
+    public String getOwnerId() {
+        return ownerId;
+    }
+
+    public void setOwnerId(String ownerId) {
+        this.ownerId = ownerId;
+    }
+
+    public String getCurDegrees() {
+        return curDegrees;
+    }
+
+    public void setCurDegrees(String curDegrees) {
+        this.curDegrees = curDegrees;
+    }
+
+    public String getPreDegrees() {
+        return preDegrees;
+    }
+
+    public void setPreDegrees(String preDegrees) {
+        this.preDegrees = preDegrees;
+    }
+
+    public Date getPreReadingTime() {
+        return preReadingTime;
+    }
+
+    public void setPreReadingTime(Date preReadingTime) {
+        this.preReadingTime = preReadingTime;
+    }
+
+    public Date getCurReadingTime() {
+        return curReadingTime;
+    }
+
+    public void setCurReadingTime(Date curReadingTime) {
+        this.curReadingTime = curReadingTime;
+    }
+
+    public String getArdId() {
+        return ardId;
+    }
+
+    public void setArdId(String ardId) {
+        this.ardId = ardId;
+    }
+
+    public String[] getStates() {
+        return states;
+    }
+
+    public void setStates(String[] states) {
+        this.states = states;
+    }
+
+    public String getFadState() {
+        return fadState;
+    }
+
+    public void setFadState(String fadState) {
+        this.fadState = fadState;
+    }
+
+    public String getFadStateName() {
+        return fadStateName;
+    }
+
+    public void setFadStateName(String fadStateName) {
+        this.fadStateName = fadStateName;
+    }
+
+    public String getAmount() {
+        return amount;
+    }
+
+    public void setAmount(String amount) {
+        this.amount = amount;
+    }
+
+    public List<FeeAccountDetailDto> getFeeAccountDetailDtoList() {
+        return feeAccountDetailDtoList;
+    }
+
+    public void setFeeAccountDetailDtoList(List<FeeAccountDetailDto> feeAccountDetailDtoList) {
+        this.feeAccountDetailDtoList = feeAccountDetailDtoList;
+    }
+
+    public List<PayFeeDetailDiscountDto> getPayFeeDetailDiscountDtoList() {
+        return payFeeDetailDiscountDtoList;
+    }
+
+    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;
+    }
 }

--
Gitblit v1.8.0