From 5c8ea097a69d7a3b46d39a1b6908d999398c415d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 13 十月 2021 09:50:14 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 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
index cce04bb..05ab4d2 100755
--- 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,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 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;
@@ -50,6 +51,7 @@
private String receivedAmountSwitch;
private String squarePrice;
+ private String mwPrice;
private String additionalAmount;
private String state;
private String stateName;
@@ -122,6 +124,10 @@
//鏌ヨ鍑虹殑鏁伴噺
private int count;
+ private String carTypeCd;
+ private String cycle;
+ private double feeTotalPrice;
+ private String batchId;
public String getAmount() {
return amount;
@@ -579,4 +585,44 @@
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