From f93b1617d28c9d353fae628bfb86e0c15fa07579 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 31 十月 2024 11:59:21 +0800
Subject: [PATCH] 1.提现-增加明细记录 2.报表-财务报表-增加总销售扎数统计，将原销售扎数改成实际销售扎数
---
src/main/java/com/mzl/flower/dto/response/wallet/WalletWithdrawRecordVO.java | 18 +++++++++++++++++-
1 files changed, 17 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..7d19754 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 = "WALLET_WITHDRAW_STATE")
+ 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,8 +49,11 @@
private LocalDateTime approveTime;
@ApiModelProperty(value = "审核状态（待审核、已通过、已拒绝）")
+ @DictTrans(target = "approveStateStr", codeType = "WALLET_APPROVE_STATE")
private String approveState;
+ private String approveStateStr;
+
@ApiModelProperty(value = "不通过原因")
private String rejectReason;
--
Gitblit v1.9.3