From 617cac9aab814b33a4a0947d7222eae1098028ca Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 28 十月 2024 16:33:52 +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/WalletBillRecordVO.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 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..5ed86d7 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
@@ -17,6 +17,25 @@
@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 = "类型明细")
+ 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 +46,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 +54,19 @@
@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;
}
--
Gitblit v1.9.3