From 32d096740cc98435af1d388b04a3a64742014354 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 14 Dec 2022 14:52:48 +0800
Subject: [PATCH] 20221213转币

---
 src/main/java/cc/mrbird/febs/dapp/entity/DappFundFlowEntity.java |   39 +++++++++++++++++++++++++++++++++++++--
 1 files changed, 37 insertions(+), 2 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 a1198ff..65a298d 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/DappFundFlowEntity.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappFundFlowEntity.java
@@ -19,11 +19,28 @@
     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, BigDecimal fee) {
-        new DappFundFlowEntity(memberId, amount, type, status, fee, null);
+        this.memberId = memberId;
+        this.amount = amount;
+        this.type = type;
+        this.status = status;
+        this.fee = fee;
     }
+
+//    public DappFundFlowEntity(Long memberId, BigDecimal amount, Integer type, Integer status, BigDecimal fee,Long systemProfitId) {
+//        this.memberId = memberId;
+//        this.amount = amount;
+//        this.type = type;
+//        this.status = status;
+//        this.fee = fee;
+//        this.systemProfitId = systemProfitId;
+//    }
 
     public DappFundFlowEntity(Long memberId, BigDecimal amount, Integer type, Integer status, BigDecimal fee, String fromHash) {
         this.memberId = memberId;
@@ -34,12 +51,23 @@
         this.fromHash = fromHash;
     }
 
+    public DappFundFlowEntity(Long memberId, BigDecimal amount, Integer type, Integer status, BigDecimal fee, String fromHash,Long systemProfitId) {
+        this.memberId = memberId;
+        this.amount = amount;
+        this.type = type;
+        this.status = status;
+        this.fee = fee;
+        this.fromHash = fromHash;
+        this.systemProfitId = systemProfitId;
+    }
+
     private Long memberId;
 
     private BigDecimal amount;
 
     /**
-     * 类型 1-买入 2-卖出 3-采矿
+     * 类型 1-买入 2-矩阵收益 3-直推收益 4-保险池 5-提现 6-手续费充值 7-手续费扣除 8-结算 9-冻结 10-冻结释放 11-产矿 12-手续费返利
+     * 类型 1-加入动能 2-技术方收益 3-直推收益 4-层级收益 5-剩余层级收益给系统 6-复投动能 7-动能收益 8-结算 9-冻结 10-冻结释放 11-产矿 12-手续费返利
      */
     private Integer type;
 
@@ -47,6 +75,11 @@
      * 状态 1-ing 2-成功 3-失败
      */
     private Integer status;
+
+    /**
+     * 状态 1-已发送 2-未发送消息
+     */
+    private Integer isReturn;
 
     @TableField(exist = false)
     private String address;
@@ -60,4 +93,6 @@
     private BigDecimal newestPrice;
 
     private BigDecimal targetAmount;
+
+    private Long systemProfitId;
 }

--
Gitblit v1.9.1