From ad959c3690aea52a0e54e92b001d1959c26c4cc4 Mon Sep 17 00:00:00 2001
From: 2019232 <zh123456>
Date: Wed, 14 Dec 2022 15:40:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/BNBWEB' into BNBWEB
---
src/main/java/cc/mrbird/febs/dapp/entity/DappFundFlowEntity.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 8 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 ed70cd5..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,20 +19,46 @@
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,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;
+ this.type = type;
+ this.status = status;
+ this.fee = fee;
+ 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;
@@ -40,7 +66,8 @@
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;
@@ -49,8 +76,23 @@
*/
private Integer status;
+ /**
+ * 状态 1-已发送 2-未发送消息
+ */
+ private Integer isReturn;
+
@TableField(exist = false)
private String address;
- private Integer fee;
+ private BigDecimal fee;
+
+ private String toHash;
+
+ private String fromHash;
+
+ private BigDecimal newestPrice;
+
+ private BigDecimal targetAmount;
+
+ private Long systemProfitId;
}
--
Gitblit v1.9.1