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/entity/wallet/WalletBillRecordDO.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDO.java b/src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDO.java
index dd22292..9c3ef1f 100644
--- a/src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDO.java
+++ b/src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDO.java
@@ -1,8 +1,8 @@
package com.mzl.flower.entity.wallet;
import java.math.BigDecimal;
+
import com.baomidou.mybatisplus.annotation.TableName;
-import com.mzl.flower.base.BaseAutoEntity;
import com.mzl.flower.base.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,11 +17,10 @@
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("t_wallet_bill_record")
-public class WalletBillRecordDO extends BaseAutoEntity {
-
+public class WalletBillRecordDO extends BaseEntity {
@ApiModelProperty(value = "供应商Id")
- private String supplierId;
+ private Long supplierId;
@ApiModelProperty(value = "钱包Id")
private Long walletId;
@@ -29,8 +28,14 @@
@ApiModelProperty(value = "账单变动类型（提现,结算）")
private String type;
+ @ApiModelProperty(value = "账单变动提现类型")
+ private String withdrawType;
+
@ApiModelProperty(value = "类型明细")
private String typeDetail;
+
+ @ApiModelProperty(value = "结算单id")
+ private String settlementId;
@ApiModelProperty(value = "转账Id")
private String transferId;
@@ -47,5 +52,28 @@
@ApiModelProperty(value = "余额")
private BigDecimal balance;
+ @ApiModelProperty(value = "转账明细id")
+ private String transferDetailId;
+
+ @ApiModelProperty(value = "转账状态")
+ private String transferState;
+
+ @ApiModelProperty(value = "openId")
+ private String openId;
+
+ @ApiModelProperty(value = "提现记录表ID")
+ private Long withdrawRecordId;
+
+ @ApiModelProperty(value = "orderNo")
+ private String orderNo;
+
+ @ApiModelProperty(value = "orderItemId")
+ private String orderItemId;
+
+ @ApiModelProperty(value = "结算金额")
+ private BigDecimal totalAmount;
+
+ @ApiModelProperty(value = "备注")
+ private String remark;
}
--
Gitblit v1.9.3