From 8c469898c0a71224e17780696d47581de47c9ed7 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 23 十月 2024 11:23:36 +0800
Subject: [PATCH] fix: 冲突
---
src/main/java/com/mzl/flower/dto/response/wallet/WalletWithdrawRecordVO.java | 2 +-
src/main/java/com/mzl/flower/dto/request/wallet/QueryWalletDTO.java | 2 ++
src/main/java/com/mzl/flower/constant/Constants.java | 16 +++++++++++++++-
src/main/java/com/mzl/flower/entity/wallet/WalletWithdrawRecordDO.java | 4 ++--
src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml | 3 +++
5 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/mzl/flower/constant/Constants.java b/src/main/java/com/mzl/flower/constant/Constants.java
index 49fe759..62c9958 100644
--- a/src/main/java/com/mzl/flower/constant/Constants.java
+++ b/src/main/java/com/mzl/flower/constant/Constants.java
@@ -603,9 +603,23 @@
}
}
- public enum WALLET_WITHDRAW_STATE {
+ public enum WALLET_APPROVE_STATE {
WAITING("待审核"), APPROVE("已通过"),REJECT("已拒绝");
+ WALLET_APPROVE_STATE(String desc) {
+ this.desc = desc;
+ }
+
+ private String desc;
+
+ public String getDesc() {
+ return desc;
+ }
+ }
+
+ public enum WALLET_WITHDRAW_STATE {
+ WAITING("提现中"),SUCCESS("提现成功"),FAILURE("提现失败");
+
WALLET_WITHDRAW_STATE(String desc) {
this.desc = desc;
}
diff --git a/src/main/java/com/mzl/flower/dto/request/wallet/QueryWalletDTO.java b/src/main/java/com/mzl/flower/dto/request/wallet/QueryWalletDTO.java
index 107c8ab..9dd1bb0 100644
--- a/src/main/java/com/mzl/flower/dto/request/wallet/QueryWalletDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/wallet/QueryWalletDTO.java
@@ -36,5 +36,7 @@
@DateTimeFormat(pattern="yyyy-MM-dd")
private LocalDate approveEndDate;
+ @ApiModelProperty(value = "提现状态")
+ private String withdrawState;
}
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 a6b9503..f5114db 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
@@ -36,7 +36,7 @@
private LocalDateTime approveTime;
@ApiModelProperty(value = "审核状态（待审核、已通过、已拒绝）")
- private Integer approveState;
+ private String approveState;
@ApiModelProperty(value = "不通过原因")
private String rejectReason;
diff --git a/src/main/java/com/mzl/flower/entity/wallet/WalletWithdrawRecordDO.java b/src/main/java/com/mzl/flower/entity/wallet/WalletWithdrawRecordDO.java
index ee2d458..42c4b3b 100644
--- a/src/main/java/com/mzl/flower/entity/wallet/WalletWithdrawRecordDO.java
+++ b/src/main/java/com/mzl/flower/entity/wallet/WalletWithdrawRecordDO.java
@@ -66,8 +66,8 @@
/**
* 审核状态
*/
- @ApiModelProperty(value = "审核状态（待审核、审核通过、审核不通过）")
- private Integer approveState;
+ @ApiModelProperty(value = "审核状态（待审核、已通过、已拒绝）")
+ private String approveState;
/**
* 不通过原因
diff --git a/src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml b/src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml
index 26d83a4..439d0eb 100644
--- a/src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml
+++ b/src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml
@@ -30,6 +30,9 @@
<if test="dto.supplierId != null and dto.supplierId != ''">
and t.supplier_id = #{dto.supplierId}
</if>
+ <if test="dto.withdrawState != null and dto.withdrawState != ''">
+ and t.withdraw_state = #{dto.withdrawState}
+ </if>
<if test="dto.createStartDate!=null ">
<![CDATA[
AND t.create_time >= #{dto.createStartDate}
--
Gitblit v1.9.3