From b34be29401abfe68c05e7e47af2888f0a54ba12f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 31 Jul 2020 15:34:12 +0800
Subject: [PATCH] 20200731 代码提交
---
src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 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 850b346..5fb8a33 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
@@ -26,14 +26,24 @@
public static final int ORDER_CAN_CLOSING_N = 0;
/**
- * 开仓类型 1-开多
+ * 开多
*/
- public static final int ORDER_OPENING_TYPE_MORE = 1;
+ public static final int OPENING_TYPE_MORE = 1;
/**
- * 开仓类型 2-开空
+ * 开空
*/
- public static final int ORDER_OPENING_TYPE_LESS = 2;
+ 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
@@ -48,7 +58,7 @@
/**
* 仓位类型 1-逐仓 2-全仓
*/
- private int potionType;
+ private int positionType;
/**
* 交易类型 1-市价 2-限价
@@ -73,7 +83,7 @@
/**
* 币种规格
*/
- private Long symbolSku;
+ private BigDecimal symbolSku;
/**
* 开仓价
@@ -81,7 +91,7 @@
private BigDecimal openingPrice;
/**
- * 开仓类型 1-开多2-开空
+ * 开仓类型 1-开多 2-开空
*/
private int openingType;
@@ -93,7 +103,7 @@
/**
* 保证金
*/
- private BigDecimal bondPrice;
+ private BigDecimal bondAmount;
/**
* 杠杆倍率
@@ -136,4 +146,14 @@
* 批次号 队列平仓时使用，避免重复
*/
public String batchNo;
+
+ /**
+ * 持仓费
+ */
+ private BigDecimal holdAmount;
+
+ /**
+ * 合约类型 1-普通合约 2-跟单合约
+ */
+ private Integer contractType;
}
--
Gitblit v1.9.1