From 9993b173a1fcc51b47bf193ae050c1cd3cf4ac1a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 14 四月 2022 15:14:42 +0800
Subject: [PATCH] 优化 缴费打印单据错误问题

---
 java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java |   90 +++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 86 insertions(+), 4 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 43aae46..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
@@ -1,8 +1,6 @@
 package com.java110.dto.fee;
 
 import com.java110.dto.PageDto;
-import com.java110.dto.RoomDto;
-import com.java110.dto.owner.OwnerCarDto;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -23,11 +21,14 @@
 
     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;
@@ -51,6 +52,7 @@
     private String receivedAmountSwitch;
 
     private String squarePrice;
+    private String mwPrice;
     private String additionalAmount;
     private String state;
     private String stateName;
@@ -65,6 +67,7 @@
     private double feePrice;
     private String payerObjType;
     private String computingFormula;
+    private String computingFormulaText;
     private String isDefault;
     private double oweFee; // 娆犺垂閲戦
     private String billType;
@@ -116,8 +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;
@@ -207,7 +220,6 @@
     public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }
-
 
     public Date getArrearsEndTime() {
         return arrearsEndTime;
@@ -553,5 +565,75 @@
         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