From 8b0dd174285faed9afdd7341a177df4e60d98192 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 25 八月 2023 01:56:25 +0800
Subject: [PATCH] 优化代码
---
java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java | 295 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 292 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 acd5fe5..4fddfb7
--- 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,11 +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_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;
@@ -49,6 +54,7 @@
private String receivedAmountSwitch;
private String squarePrice;
+ private String mwPrice;
private String additionalAmount;
private String state;
private String stateName;
@@ -63,6 +69,7 @@
private double feePrice;
private String payerObjType;
private String computingFormula;
+ private String computingFormulaText;
private String isDefault;
private double oweFee; // 娆犺垂閲戦
private String billType;
@@ -84,6 +91,8 @@
private String ownerTel;
+ private String ownerId;
+
private Date createTime;
@@ -101,6 +110,8 @@
private Date deadlineTime;
+ private Date maxEndTime;
+
private Date importFeeEndTime;
@@ -112,6 +123,51 @@
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;
+
+ private String customStartTime;
+ private String customEndTime;
+
+ private String deleteFlag;
+
+ private String prepaymentPeriod;
+
+
+ private String feeNameLike;
+
+ private String staffNameLike;
+
+ private String logStartTime;
+ private String logEndTime;
public String getAmount() {
return amount;
@@ -169,7 +225,6 @@
this.payerObjId = payerObjId;
}
-
public Date getCreateTime() {
return createTime;
}
@@ -201,7 +256,6 @@
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
-
public Date getArrearsEndTime() {
return arrearsEndTime;
@@ -538,4 +592,239 @@
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;
+ }
+
+ public String getCustomStartTime() {
+ return customStartTime;
+ }
+
+ public void setCustomStartTime(String customStartTime) {
+ this.customStartTime = customStartTime;
+ }
+
+ public String getCustomEndTime() {
+ return customEndTime;
+ }
+
+ public void setCustomEndTime(String customEndTime) {
+ this.customEndTime = customEndTime;
+ }
+
+ public String getDeleteFlag() {
+ return deleteFlag;
+ }
+
+ public void setDeleteFlag(String deleteFlag) {
+ this.deleteFlag = deleteFlag;
+ }
+
+ public String getPrepaymentPeriod() {
+ return prepaymentPeriod;
+ }
+
+ public void setPrepaymentPeriod(String prepaymentPeriod) {
+ this.prepaymentPeriod = prepaymentPeriod;
+ }
+
+ public String getFeeNameLike() {
+ return feeNameLike;
+ }
+
+ public void setFeeNameLike(String feeNameLike) {
+ this.feeNameLike = feeNameLike;
+ }
+
+ public String getStaffNameLike() {
+ return staffNameLike;
+ }
+
+ public void setStaffNameLike(String staffNameLike) {
+ this.staffNameLike = staffNameLike;
+ }
+
+ public String getLogStartTime() {
+ return logStartTime;
+ }
+
+ public void setLogStartTime(String logStartTime) {
+ this.logStartTime = logStartTime;
+ }
+
+ public String getLogEndTime() {
+ return logEndTime;
+ }
+
+ public void setLogEndTime(String logEndTime) {
+ this.logEndTime = logEndTime;
+ }
}
--
Gitblit v1.8.0