From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-bean/src/main/java/com/java110/dto/fee/FeeDetailDto.java | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 105 insertions(+), 1 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/fee/FeeDetailDto.java b/java110-bean/src/main/java/com/java110/dto/fee/FeeDetailDto.java
index efb5255..50411ec 100755
--- a/java110-bean/src/main/java/com/java110/dto/fee/FeeDetailDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/fee/FeeDetailDto.java
@@ -1,9 +1,12 @@
package com.java110.dto.fee;
import com.java110.dto.PageDto;
+import com.java110.dto.feeAccountDetail.FeeAccountDetailDto;
+import com.java110.dto.payFeeDetailDiscount.PayFeeDetailDiscountDto;
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* @ClassName FloorDto
@@ -15,7 +18,25 @@
**/
public class FeeDetailDto extends PageDto implements Serializable {
+
+ public static final String PRIME_REATE_WECHAT_QRCODE = "3";
+ public static final String PRIME_REATE_ALI_QRCODE = "4";
public static final String PRIME_REATE_WECHAT = "5";
+ public static final String PRIME_REATE_CRASH = "1";
+ public static final String PRIME_REATE_WECHAT_APP = "6";
+ public static final String STATE_RETURNING = "1000";
+ public static final String STATE_RETURNED = "1100";
+ public static final String STATE_RETURN_ERROR = "1200";
+ public static final String STATE_RETURN_ORDER = "1300";
+ public static final String STATE_NORMAL = "1400";
+
+ /**
+ * 1000 閫�璐逛腑
+ * 1100 宸查��璐�
+ * 1200 閫�璐瑰け璐�
+ * 1300 閫�璐瑰崟
+ * 1400 姝ｅ父
+ */
private String primeRate;
private String detailId;
@@ -23,10 +44,12 @@
private String cycles;
private String remark;
private String receivedAmount;
+ private String payableAmount;
private String communityId;
private String feeId;
private String bId;
private String payerObjId;
+ private String payerObjName;
private String payerObjType;
private Date createTime;
@@ -49,6 +72,16 @@
private String ardId;
private String[] states;
+ private String payOrderId;
+
+ private List<FeeAccountDetailDto> feeAccountDetailDtoList;
+ private List<PayFeeDetailDiscountDto> payFeeDetailDiscountDtoList;
+
+ private String fadState;
+ private String fadStateName;
+ private String amount;
+
+ private String primeRateName;
public String getPrimeRate() {
return primeRate;
@@ -113,7 +146,6 @@
public void setFeeId(String feeId) {
this.feeId = feeId;
}
-
public Date getCreateTime() {
return createTime;
@@ -274,4 +306,76 @@
public void setStates(String[] states) {
this.states = states;
}
+
+ public String getFadState() {
+ return fadState;
+ }
+
+ public void setFadState(String fadState) {
+ this.fadState = fadState;
+ }
+
+ public String getFadStateName() {
+ return fadStateName;
+ }
+
+ public void setFadStateName(String fadStateName) {
+ this.fadStateName = fadStateName;
+ }
+
+ public String getAmount() {
+ return amount;
+ }
+
+ public void setAmount(String amount) {
+ this.amount = amount;
+ }
+
+ public List<FeeAccountDetailDto> getFeeAccountDetailDtoList() {
+ return feeAccountDetailDtoList;
+ }
+
+ public void setFeeAccountDetailDtoList(List<FeeAccountDetailDto> feeAccountDetailDtoList) {
+ this.feeAccountDetailDtoList = feeAccountDetailDtoList;
+ }
+
+ public List<PayFeeDetailDiscountDto> getPayFeeDetailDiscountDtoList() {
+ return payFeeDetailDiscountDtoList;
+ }
+
+ public void setPayFeeDetailDiscountDtoList(List<PayFeeDetailDiscountDto> payFeeDetailDiscountDtoList) {
+ this.payFeeDetailDiscountDtoList = payFeeDetailDiscountDtoList;
+ }
+
+ public String getPayableAmount() {
+ return payableAmount;
+ }
+
+ public void setPayableAmount(String payableAmount) {
+ this.payableAmount = payableAmount;
+ }
+
+ public String getPayOrderId() {
+ return payOrderId;
+ }
+
+ public void setPayOrderId(String payOrderId) {
+ this.payOrderId = payOrderId;
+ }
+
+ public String getPrimeRateName() {
+ return primeRateName;
+ }
+
+ public void setPrimeRateName(String primeRateName) {
+ this.primeRateName = primeRateName;
+ }
+
+ public String getPayerObjName() {
+ return payerObjName;
+ }
+
+ public void setPayerObjName(String payerObjName) {
+ this.payerObjName = payerObjName;
+ }
}
--
Gitblit v1.8.0