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/FeeDto.java |  155 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 152 insertions(+), 3 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 cce04bb..321ce31
--- 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,16 @@
 
     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_CYCLE = "1003006";
+    public static final String FEE_FLAG_ONCE = "2006012";//涓�娆℃�ц垂鐢�
+    public static final String FEE_FLAG_CYCLE = "1003006";//鍛ㄦ湡鎬ц垂鐢�
+    public static final String FEE_FLAG_CYCLE_ONCE = "4012024";//闂存帴鎬ц垂鐢�
     public static final String REDIS_PAY_OWE_FEE = "PAY_OWE_FEE_";
+    public static final String REDIS_PAY_TEMP_CAR_FEE = "PAY_TEMP_CAR_FEE_";
+    public static final String REDIS_PAY_TEMP_CAR_FEE_COMMUNITY = "REDIS_PAY_TEMP_CAR_FEE_COMMUNITY_";
 
     private String amount;
     private String incomeObjId;
@@ -50,6 +54,7 @@
     private String receivedAmountSwitch;
 
     private String squarePrice;
+    private String mwPrice;
     private String additionalAmount;
     private String state;
     private String stateName;
@@ -105,6 +110,8 @@
 
     private Date deadlineTime;
 
+    private Date maxEndTime;
+
     private Date importFeeEndTime;
 
 
@@ -122,6 +129,26 @@
     //鏌ヨ鍑虹殑鏁伴噺
     private int count;
 
+    private String carTypeCd;
+    private String cycle;
+    private double feeTotalPrice;
+    private String batchId;
+    private String custEndTime;
+
+    private String offlinePayFeeSwitch;
+
+    private String deductFrom;
+
+    private String rateCycle;
+
+    private String rate;
+
+    private String rateStartTime;
+
+    private String payOnline;
+    private String scale;
+    private String decimalPlace;
+    private String units;
 
     public String getAmount() {
         return amount;
@@ -178,7 +205,6 @@
     public void setPayerObjId(String payerObjId) {
         this.payerObjId = payerObjId;
     }
-
 
     public Date getCreateTime() {
         return createTime;
@@ -579,4 +605,127 @@
     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;
+    }
+
+    public String getDeductFrom() { return deductFrom; }
+
+    public void setDeductFrom(String deductFrom) { this.deductFrom = deductFrom; }
+    public String getCustEndTime() {
+        return custEndTime;
+    }
+
+    public void setCustEndTime(String custEndTime) {
+        this.custEndTime = custEndTime;
+    }
+
+    public String getRateCycle() {
+        return rateCycle;
+    }
+
+    public void setRateCycle(String rateCycle) {
+        this.rateCycle = rateCycle;
+    }
+
+    public String getRate() {
+        return rate;
+    }
+
+    public void setRate(String rate) {
+        this.rate = rate;
+    }
+
+    public String getRateStartTime() {
+        return rateStartTime;
+    }
+
+    public void setRateStartTime(String rateStartTime) {
+        this.rateStartTime = rateStartTime;
+    }
+
+    public Date getMaxEndTime() {
+        return maxEndTime;
+    }
+
+    public void setMaxEndTime(Date maxEndTime) {
+        this.maxEndTime = maxEndTime;
+    }
+
+    public String getPayOnline() {
+        return payOnline;
+    }
+
+    public void setPayOnline(String payOnline) {
+        this.payOnline = payOnline;
+    }
+
+    public String getScale() {
+        return scale;
+    }
+
+    public void setScale(String scale) {
+        this.scale = scale;
+    }
+
+    public String getDecimalPlace() {
+        return decimalPlace;
+    }
+
+    public void setDecimalPlace(String decimalPlace) {
+        this.decimalPlace = decimalPlace;
+    }
+
+    public String getUnits() {
+        return units;
+    }
+
+    public void setUnits(String units) {
+        this.units = units;
+    }
 }

--
Gitblit v1.8.0