From 12af3cd3197d30be904165f043f916dcf620a366 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 26 May 2023 16:47:58 +0800
Subject: [PATCH] twoCoin项目修改

---
 src/main/java/cc/mrbird/febs/dapp/entity/DappFundFlowEntity.java |   46 ++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 44 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 05b44a6..187b386 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/DappFundFlowEntity.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappFundFlowEntity.java
@@ -33,6 +33,15 @@
         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;
         this.amount = amount;
@@ -42,12 +51,34 @@
         this.fromHash = fromHash;
     }
 
+    public DappFundFlowEntity(Long memberId, BigDecimal amount, Integer type, Integer status, BigDecimal fee, String fromHash,String toHash) {
+        this.memberId = memberId;
+        this.amount = amount;
+        this.type = type;
+        this.status = status;
+        this.fee = fee;
+        this.fromHash = fromHash;
+        this.toHash = toHash;
+    }
+
+    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-采矿 4-返利 5-获取盲盒 6-开盲盒获取卡牌 7-推荐奖励 8-激活盲盒
+     * 类型 1-买入 2-矩阵收益 3-直推收益 4-保险池 5-提现 6-手续费充值 7-手续费扣除 8-结算 9-冻结 10-冻结释放 11-产矿 12-手续费返利
+     * 类型 1-加入动能 2-技术方收益 3-直推收益 4-层级收益 5-剩余层级收益给系统 6-复投动能 7-动能收益 8-结算 9-冻结 10-冻结释放 11-产矿 12-手续费返利
+     * 类型 1-认购节点 2-直推收益 3-技术方收款 4-入金,买入A币 5-进入a底池
      */
     private Integer type;
 
@@ -56,11 +87,18 @@
      */
     private Integer status;
 
+    /**
+     * 状态 1-已发送 2-未发送消息
+     */
+    private Integer isReturn;
+
     @TableField(exist = false)
     private String address;
 
     private BigDecimal fee;
-
+    /**
+     * 用来存放用户购买节点的节点编码
+     */
     private String toHash;
 
     private String fromHash;
@@ -68,4 +106,8 @@
     private BigDecimal newestPrice;
 
     private BigDecimal targetAmount;
+    /**
+     * 会员节点表ID-对应认购记录
+     */
+    private Long systemProfitId;
 }

--
Gitblit v1.9.1