From 4e7907983a99e695f2acba4dec8bd73b7dbe6b2b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 29 六月 2023 14:41:33 +0800
Subject: [PATCH] optimize

---
 java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java |  260 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 257 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 c242c3e..591e761
--- 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,20 @@
 
     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 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;
+    private String incomeObjName;
     private String feeTypeCd;
     private Date startTime;
     private Date endTime;
@@ -39,7 +47,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 +69,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 +90,8 @@
     private String ownerName;
 
     private String ownerTel;
+
+    private String ownerId;
 
 
     private Date createTime;
@@ -91,6 +110,8 @@
 
     private Date deadlineTime;
 
+    private Date maxEndTime;
+
     private Date importFeeEndTime;
 
 
@@ -102,6 +123,36 @@
 
     private List<FeeAttrDto> feeAttrDtos;
 
+    //褰撳墠鏃堕棿
+    private Date nowDate;
+
+    //鏌ヨ鍑虹殑鏁伴噺
+    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;
+
+    private String operate;
+
+    private String userName;
 
     public String getAmount() {
         return amount;
@@ -159,7 +210,6 @@
         this.payerObjId = payerObjId;
     }
 
-
     public Date getCreateTime() {
         return createTime;
     }
@@ -191,7 +241,6 @@
     public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }
-
 
     public Date getArrearsEndTime() {
         return arrearsEndTime;
@@ -496,4 +545,209 @@
     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;
+    }
+
+    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;
+    }
+
+    public String getOperate() {
+        return operate;
+    }
+
+    public void setOperate(String operate) {
+        this.operate = operate;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+
 }

--
Gitblit v1.8.0