From 05c74ca131add20dbcf23dc109e63c21b3e2be29 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 24 Feb 2021 18:11:57 +0800
Subject: [PATCH] Merge branch 'whole_new_trc20' into whole_new
---
src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java b/src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java
index 989a8ca..18ac9ea 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java
@@ -1,5 +1,6 @@
package com.xcong.excoin.modules.contract.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.xcong.excoin.common.system.base.BaseEntity;
import lombok.Data;
@@ -26,6 +27,26 @@
public static final int ORDER_CAN_CLOSING_N = 0;
/**
+ * 开多
+ */
+ public static final int OPENING_TYPE_MORE = 1;
+
+ /**
+ * 开空
+ */
+ public static final int OPENING_TYPE_LESS = 2;
+
+ /**
+ * 交易类型 市价
+ */
+ public static final int TRADE_TYPE_MARK = 1;
+
+ /**
+ * 交易类型 限价
+ */
+ public static final int TRADE_TYPE_LIMIT = 2;
+
+ /**
* 会员Id
*/
private Long memberId;
@@ -38,7 +59,7 @@
/**
* 仓位类型 1-逐仓 2-全仓
*/
- private int potionType;
+ private int positionType;
/**
* 交易类型 1-市价 2-限价
@@ -63,7 +84,7 @@
/**
* 币种规格
*/
- private Long symbolSku;
+ private BigDecimal symbolSku;
/**
* 开仓价
@@ -71,7 +92,7 @@
private BigDecimal openingPrice;
/**
- * 开仓类型 1-开多 2-开多
+ * 开仓类型 1-开多 2-开空
*/
private int openingType;
@@ -83,7 +104,7 @@
/**
* 保证金
*/
- private BigDecimal bondPrice;
+ private BigDecimal bondAmount;
/**
* 杠杆倍率
@@ -126,4 +147,25 @@
* 批次号 队列平仓时使用，避免重复
*/
public String batchNo;
+
+ /**
+ * 持仓费
+ */
+ private BigDecimal holdAmount;
+
+ /**
+ * 合约类型 1-普通合约 2-跟单合约
+ */
+ private Integer contractType;
+
+ /**
+ * 已实现盈亏
+ */
+// @TableField(exist = false)
+ private BigDecimal rewardAmount;
+
+ /**
+ * 维持保证金
+ */
+ private BigDecimal holdBond;
}
--
Gitblit v1.9.1