From a2d9bd16ac1106489572a5f7d8d70e1086d5406d Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 31 May 2020 21:19:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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..4b40c14 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
@@ -81,7 +91,7 @@
private BigDecimal openingPrice;
/**
- * 开仓类型 1-开多2-开空
+ * 开仓类型 1-开多 2-开空
*/
private int openingType;
--
Gitblit v1.9.1