From db1734ef2e2da94c027bcb9e31ad7a5d13c3c8f9 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 10 Nov 2022 22:05:10 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/dapp/entity/DappFundFlowEntity.java |   33 ++++++++++++++++++++++++---------
 1 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/DappFundFlowEntity.java b/src/main/java/cc/mrbird/febs/dapp/entity/DappFundFlowEntity.java
index f234cd5..48b26b4 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/DappFundFlowEntity.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappFundFlowEntity.java
@@ -9,7 +9,7 @@
 import java.util.Date;
 
 /**
- * @author wzy
+ * @author 
  * @date 2022-03-21
  **/
 @Data
@@ -19,20 +19,27 @@
     public static final int WITHDRAW_STATUS_AGREE = 2;
     public static final int WITHDRAW_STATUS_DISAGREE = 3;
 
+
+    public static final int TYPE_BUY = 1;
+    public static final int TYPE_SALE = 2;
+
     public DappFundFlowEntity() {}
 
-    public DappFundFlowEntity(Long memberId, BigDecimal amount, Integer type, Integer status, Integer fee) {
+    public DappFundFlowEntity(Long memberId, BigDecimal amount, Integer type, Integer status, BigDecimal fee) {
         this.memberId = memberId;
         this.amount = amount;
         this.type = type;
         this.status = status;
         this.fee = fee;
+    }
 
-        this.setCreateBy("system");
-        this.setUpdateBy("system");
-        this.setCreateTime(new Date());
-        this.setUpdateTime(new Date());
-        this.setVersion(1);
+    public DappFundFlowEntity(Long memberId, BigDecimal amount, Integer type, Integer status, BigDecimal fee, String fromHash) {
+        this.memberId = memberId;
+        this.amount = amount;
+        this.type = type;
+        this.status = status;
+        this.fee = fee;
+        this.fromHash = fromHash;
     }
 
     private Long memberId;
@@ -40,7 +47,7 @@
     private BigDecimal amount;
 
     /**
-     * 类型 1-兑换 2-提现 3-采矿
+     * 类型 1-买入 2-矩阵收益 3-直推收益 4-保险池 5-提现 6-手续费充值 7-手续费扣除 8-结算 9-冻结 10-冻结释放 11-产矿 12-手续费返利
      */
     private Integer type;
 
@@ -52,5 +59,13 @@
     @TableField(exist = false)
     private String address;
 
-    private Integer fee;
+    private BigDecimal fee;
+
+    private String toHash;
+
+    private String fromHash;
+
+    private BigDecimal newestPrice;
+
+    private BigDecimal targetAmount;
 }

--
Gitblit v1.9.1