From eeb3b46afe7da500bce62daad35ded0886df3b88 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 09 一月 2025 18:31:12 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4
---
src/main/java/com/mzl/flower/dto/response/wallet/WalletWithdrawRecordVO.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/wallet/WalletWithdrawRecordVO.java b/src/main/java/com/mzl/flower/dto/response/wallet/WalletWithdrawRecordVO.java
index f5114db..64f50e1 100644
--- a/src/main/java/com/mzl/flower/dto/response/wallet/WalletWithdrawRecordVO.java
+++ b/src/main/java/com/mzl/flower/dto/response/wallet/WalletWithdrawRecordVO.java
@@ -1,6 +1,7 @@
package com.mzl.flower.dto.response.wallet;
import com.mzl.flower.base.AbstractTransDTO;
+import com.mzl.flower.base.annotation.DictTrans;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,11 +24,23 @@
@ApiModelProperty(value = "提现金额")
private BigDecimal onceWithdrawAmount;
+ @ApiModelProperty(value = "提现类型")
+ @DictTrans(target = "withdrawTypeStr", codeType = "WALLET_WITHDRAW_TYPE")
+ private String withdrawType;
+
+ private String withdrawTypeStr;
+
@ApiModelProperty(value = "提现状态（提现中、提现成功、提现失败）")
- private Integer withdrawState;
+ @DictTrans(target = "withdrawStateStr", codeType = "BILL_WITHDRAW_TYPE")
+ private String withdrawState;
+
+ private String withdrawStateStr;
@ApiModelProperty(value = "提现方式（微信）")
+ @DictTrans(target = "methodStr", codeType = "WALLET_WITHDRAW_METHOD")
private String method;
+
+ private String methodStr;
@ApiModelProperty(value = "审核人")
private String approveBy;
@@ -36,7 +49,10 @@
private LocalDateTime approveTime;
@ApiModelProperty(value = "审核状态（待审核、已通过、已拒绝）")
+ @DictTrans(target = "approveStateStr", codeType = "WALLET_APPROVE_STATE")
private String approveState;
+
+ private String approveStateStr;
@ApiModelProperty(value = "不通过原因")
private String rejectReason;
@@ -52,4 +68,7 @@
@ApiModelProperty("更新人")
private String updateBy;
+
+ @ApiModelProperty(value = "审核人")
+ private String approveName;
}
--
Gitblit v1.9.3