From 736ab0090700c75af37b8a3456b01609e4e2d329 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 17 七月 2024 11:09:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/WithdrawalWarpper.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/WithdrawalWarpper.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/WithdrawalWarpper.java
index e9b1d9c..086ea47 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/WithdrawalWarpper.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/WithdrawalWarpper.java
@@ -21,6 +21,12 @@
private String remark;
@ApiModelProperty("提现状态（1=待处理，2=成功，3=失败）")
private Integer state;
+ @ApiModelProperty("已提现总金额")
+ private Double withdrawn;
+ @ApiModelProperty("处理中总金额")
+ private Double processing;
+ @ApiModelProperty("提现失败总金额")
+ private Double fail;
public Integer getId() {
return id;
@@ -69,7 +75,31 @@
public void setState(Integer state) {
this.state = state;
}
-
+
+ public Double getWithdrawn() {
+ return withdrawn;
+ }
+
+ public void setWithdrawn(Double withdrawn) {
+ this.withdrawn = withdrawn;
+ }
+
+ public Double getProcessing() {
+ return processing;
+ }
+
+ public void setProcessing(Double processing) {
+ this.processing = processing;
+ }
+
+ public Double getFail() {
+ return fail;
+ }
+
+ public void setFail(Double fail) {
+ this.fail = fail;
+ }
+
@Override
public String toString() {
return "WithdrawalWarpper{" +
@@ -93,6 +123,9 @@
withdrawalWarpper.setRemark(null != map.get("remark") ? String.valueOf(map.get("remark")) : "");
withdrawalWarpper.setState(null != map.get("state") ? Integer.valueOf(String.valueOf(map.get("state"))) : 0);
withdrawalWarpper.setInsertTime(null != map.get("insertTime") ? String.valueOf(map.get("insertTime")) : "");
+ withdrawalWarpper.setWithdrawn(null != map.get("withdrawn") ? Double.valueOf(String.valueOf(map.get("withdrawn"))) : 0);
+ withdrawalWarpper.setProcessing(null != map.get("processing") ? Double.valueOf(String.valueOf(map.get("processing"))) : 0);
+ withdrawalWarpper.setFail(null != map.get("fail") ? Double.valueOf(String.valueOf(map.get("fail"))) : 0);
list.add(withdrawalWarpper);
}
}
--
Gitblit v1.7.1