From 61fafb87c2ba69b28fd145a31b72782e528a57da Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 05 Jun 2020 17:40:11 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin.git
---
src/main/java/com/xcong/excoin/modules/contract/entity/ContractOrderEntity.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/entity/ContractOrderEntity.java b/src/main/java/com/xcong/excoin/modules/contract/entity/ContractOrderEntity.java
index 680ca35..2060785 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/entity/ContractOrderEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/entity/ContractOrderEntity.java
@@ -27,11 +27,10 @@
*/
public static final int TRADE_TYPE_LIMIT_PRICE = 2;
-
/**
- * 订单类型 撤单
+ * 订单状态 撤单
*/
- public static final int ORDER_TYPE_CANCEL = -1;
+ public static final int ORDER_STATUS_CANCEL = 2;
/**
* 订单类型 开多
@@ -75,11 +74,16 @@
private int tradeType;
/**
- * 订单类型 - 0撤单,1开多,2开空,3平多,4平空
+ * 订单类型 - 1开多,2开空,3平多,4平空
*/
private int orderType;
/**
+ * 订单状态 - 1成交 2撤单
+ */
+ private int orderStatus;
+
+ /**
* 委托开仓价
*/
private BigDecimal entrustOpeningPrice;
--
Gitblit v1.9.1