From ddca8e96ee1aa47ba33fcf3a9a1e7e964d63ad8b Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 31 十月 2024 17:15:43 +0800
Subject: [PATCH] fix: 钱包供应商财务1
---
src/main/java/com/mzl/flower/dto/response/wallet/WalletBillRecordVO.java | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/wallet/WalletBillRecordVO.java b/src/main/java/com/mzl/flower/dto/response/wallet/WalletBillRecordVO.java
index 18ed3be..d3a7d17 100644
--- a/src/main/java/com/mzl/flower/dto/response/wallet/WalletBillRecordVO.java
+++ b/src/main/java/com/mzl/flower/dto/response/wallet/WalletBillRecordVO.java
@@ -10,13 +10,36 @@
@Data
public class WalletBillRecordVO extends AbstractTransDTO {
- private Long id;
+ private String id;
@ApiModelProperty(value = "供应商Id")
private Long supplierId;
@ApiModelProperty(value = "供应商名称")
private String supplierName;
+ @ApiModelProperty(value = "钱包Id")
+ private Long walletId;
+
+ @ApiModelProperty(value = "账单变动类型（提现,结算）")
+ @DictTrans(target = "typeName",codeType = "BILL_CHANGE_TYPE")
+ private String type;
+
+ @ApiModelProperty(value = "账单提现类型")
+ @DictTrans(target = "withdrawTypeName",codeType = "BILL_WITHDRAW_TYPE")
+ private String withdrawType;
+
+ @ApiModelProperty(value = "类型明细")
+ private String typeDetail;
+
+ @ApiModelProperty(value = "结算单id")
+ private String settlementId;
+
+ @ApiModelProperty(value = "转账Id")
+ private String transferId;
+
+ @ApiModelProperty(value = "变动方式（增加、减少")
+ @DictTrans(target = "methodName",codeType = "BILL_CHANGE_METHOD")
+ private String method;
@ApiModelProperty(value = "原金额")
private BigDecimal originalAmount;
@@ -27,12 +50,6 @@
@ApiModelProperty(value = "余额")
private BigDecimal balance;
- @ApiModelProperty(value = "账单变动类型（提现,结算）")
- @DictTrans(target = "withdrawStateStr", codeType = "BILL_CHANGE_TYPE")
- private String type;
-
- private String typeStr;
-
@ApiModelProperty("提交时间")
private LocalDateTime createTime;
@@ -41,5 +58,22 @@
@ApiModelProperty(value = "备注")
private String remark;
+ @ApiModelProperty(value = "转账明细id")
+ private String transferDetailId;
+
+ @ApiModelProperty(value = "转账状态")
+ private String transferState;
+
+ @ApiModelProperty(value = "openId")
+ private String openId;
+
+ @ApiModelProperty(value = "账单变动类型（提现,结算）")
+ private String typeName;
+
+ @ApiModelProperty(value = "变动方式（增加、减少")
+ private String methodName;
+
+ @ApiModelProperty(value = "账单提现类型名称（发起提现、提现失败、提现成功）")
+ private String withdrawTypeName;
}
--
Gitblit v1.9.3