From 48c9414db4b7c44a43524115570796025d38a653 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 17 一月 2022 16:37:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 2 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 d7759ae..0dc1cd1
--- 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,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_CYCLE = "1003006";
+ 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;
@@ -50,6 +52,7 @@
private String receivedAmountSwitch;
private String squarePrice;
+ private String mwPrice;
private String additionalAmount;
private String state;
private String stateName;
@@ -64,6 +67,7 @@
private double feePrice;
private String payerObjType;
private String computingFormula;
+ private String computingFormulaText;
private String isDefault;
private double oweFee; // 娆犺垂閲戦
private String billType;
@@ -121,6 +125,10 @@
//鏌ヨ鍑虹殑鏁伴噺
private int count;
+ private String carTypeCd;
+ private String cycle;
+ private double feeTotalPrice;
+ private String batchId;
public String getAmount() {
return amount;
@@ -570,4 +578,52 @@
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;
+ }
}
--
Gitblit v1.8.0