From 4e134e61ede1f8574189af45c810ca365c7c7f9a Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 12 五月 2022 18:33:14 +0800
Subject: [PATCH] 优化代码

---
 java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java |  144 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 142 insertions(+), 2 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java b/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java
old mode 100644
new mode 100755
index c242c3e..834cb3e
--- a/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java
@@ -21,12 +21,18 @@
 
     public static final String PAYER_OBJ_TYPE_ROOM = "3333"; //鎴垮眿 6666 鏄溅浣�
     public static final String PAYER_OBJ_TYPE_PARKING_SPACE = "6666";//鏄溅浣�
+    public static final String PAYER_OBJ_TYPE_CONTRACT = "7777";//鏄悎鍚�
     public static final String PAYER_OBJ_TYPE_CAR = "6666";//鏄溅浣�
+    public static final String PAYER_OBJ_TYPE_RENTING = "9999";//鎴挎簮ID
 
-    public static final String FEE_FLAG_ONCE = "2006012";
+    public static final String FEE_FLAG_ONCE = "2006012";//涓�娆℃�ц垂鐢�
+    public static final String FEE_FLAG_CYCLE = "1003006";//鍛ㄦ湡鎬ц垂鐢�
+    public static final String REDIS_PAY_OWE_FEE = "PAY_OWE_FEE_";
+    public static final String REDIS_PAY_TEMP_CAR_FEE = "PAY_TEMP_CAR_FEE_";
 
     private String amount;
     private String incomeObjId;
+    private String incomeObjName;
     private String feeTypeCd;
     private Date startTime;
     private Date endTime;
@@ -39,7 +45,14 @@
     private String[] feeTypeCds;
     private String configId;
 
+    //鏄犲皠鍏崇郴寮�鍏冲��
+    private String val;
+
+    //瀹炴敹閲戦鏄犲皠寮�鍏冲��
+    private String receivedAmountSwitch;
+
     private String squarePrice;
+    private String mwPrice;
     private String additionalAmount;
     private String state;
     private String stateName;
@@ -54,10 +67,12 @@
     private double feePrice;
     private String payerObjType;
     private String computingFormula;
+    private String computingFormulaText;
     private String isDefault;
     private double oweFee; // 娆犺垂閲戦
     private String billType;
     private String billTypeName;
+    private String builtUpArea;
 
     private String paymentCd;
 
@@ -73,6 +88,8 @@
     private String ownerName;
 
     private String ownerTel;
+
+    private String ownerId;
 
 
     private Date createTime;
@@ -102,6 +119,18 @@
 
     private List<FeeAttrDto> feeAttrDtos;
 
+    //褰撳墠鏃堕棿
+    private Date nowDate;
+
+    //鏌ヨ鍑虹殑鏁伴噺
+    private int count;
+
+    private String carTypeCd;
+    private String cycle;
+    private double feeTotalPrice;
+    private String batchId;
+
+    private String offlinePayFeeSwitch;
 
     public String getAmount() {
         return amount;
@@ -191,7 +220,6 @@
     public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }
-
 
     public Date getArrearsEndTime() {
         return arrearsEndTime;
@@ -496,4 +524,116 @@
     public void setFeeAttrDtos(List<FeeAttrDto> feeAttrDtos) {
         this.feeAttrDtos = feeAttrDtos;
     }
+
+    public String getIncomeObjName() {
+        return incomeObjName;
+    }
+
+    public void setIncomeObjName(String incomeObjName) {
+        this.incomeObjName = incomeObjName;
+    }
+
+    public String getBuiltUpArea() {
+        return builtUpArea;
+    }
+
+    public void setBuiltUpArea(String builtUpArea) {
+        this.builtUpArea = builtUpArea;
+    }
+
+    public String getVal() {
+        return val;
+    }
+
+    public void setVal(String value) {
+        this.val = value;
+    }
+
+    public String getReceivedAmountSwitch() {
+        return receivedAmountSwitch;
+    }
+
+    public void setReceivedAmountSwitch(String receivedAmountSwitch) {
+        this.receivedAmountSwitch = receivedAmountSwitch;
+    }
+
+    public String getOwnerId() {
+        return ownerId;
+    }
+
+    public void setOwnerId(String ownerId) {
+        this.ownerId = ownerId;
+    }
+
+    public Date getNowDate() {
+        return nowDate;
+    }
+
+    public void setNowDate(Date nowDate) {
+        this.nowDate = nowDate;
+    }
+
+    public int getCount() {
+        return count;
+    }
+
+    public void setCount(int count) {
+        this.count = count;
+    }
+
+    public String getComputingFormulaText() {
+        return computingFormulaText;
+    }
+
+    public void setComputingFormulaText(String computingFormulaText) {
+        this.computingFormulaText = computingFormulaText;
+    }
+
+    public String getMwPrice() {
+        return mwPrice;
+    }
+
+    public void setMwPrice(String mwPrice) {
+        this.mwPrice = mwPrice;
+    }
+
+    public String getCarTypeCd() {
+        return carTypeCd;
+    }
+
+    public void setCarTypeCd(String carTypeCd) {
+        this.carTypeCd = carTypeCd;
+    }
+
+    public String getCycle() {
+        return cycle;
+    }
+
+    public void setCycle(String cycle) {
+        this.cycle = cycle;
+    }
+
+    public double getFeeTotalPrice() {
+        return feeTotalPrice;
+    }
+
+    public void setFeeTotalPrice(double feeTotalPrice) {
+        this.feeTotalPrice = feeTotalPrice;
+    }
+
+    public String getBatchId() {
+        return batchId;
+    }
+
+    public void setBatchId(String batchId) {
+        this.batchId = batchId;
+    }
+
+    public String getOfflinePayFeeSwitch() {
+        return offlinePayFeeSwitch;
+    }
+
+    public void setOfflinePayFeeSwitch(String offlinePayFeeSwitch) {
+        this.offlinePayFeeSwitch = offlinePayFeeSwitch;
+    }
 }

--
Gitblit v1.8.0