From a5e6a69003f869d667a462d3d0273437080de834 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 27 五月 2021 15:03:39 +0800
Subject: [PATCH] 优化代码
---
java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 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 43aae46..cbd54a2
--- 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,10 +21,12 @@
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 REDIS_PAY_OWE_FEE = "PAY_OWE_FEE_";
private String amount;
@@ -65,6 +65,7 @@
private double feePrice;
private String payerObjType;
private String computingFormula;
+ private String computingFormulaText;
private String isDefault;
private double oweFee; // 娆犺垂閲戦
private String billType;
@@ -116,7 +117,11 @@
private List<FeeAttrDto> feeAttrDtos;
+ //褰撳墠鏃堕棿
+ private Date nowDate;
+ //鏌ヨ鍑虹殑鏁伴噺
+ private int count;
public String getAmount() {
@@ -207,7 +212,6 @@
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
-
public Date getArrearsEndTime() {
return arrearsEndTime;
@@ -553,5 +557,27 @@
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;
+ }
}
--
Gitblit v1.8.0