From 01aa2cc5c8fafd89ff763bfb0016c4983ff79648 Mon Sep 17 00:00:00 2001
From: gao <gaoleox@163>
Date: Fri, 05 Jun 2020 19:33:20 +0800
Subject: [PATCH] Merge branch 'master' of https://chonggaoxiao:xcg523511090712@gitee.com/chonggaoxiao/new_excoin.git
---
src/main/java/com/xcong/excoin/modules/contract/entity/ContractOrderEntity.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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..9a82765 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
@@ -1,5 +1,8 @@
package com.xcong.excoin.modules.contract.entity;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.xcong.excoin.common.system.base.BaseEntity;
import lombok.Data;
@@ -27,11 +30,15 @@
*/
public static final int TRADE_TYPE_LIMIT_PRICE = 2;
+ /**
+ * 订单状态 撤单
+ */
+ public static final int ORDER_STATUS_CANCEL = 2;
/**
- * 订单类型 撤单
+ * 订单状态 成交
*/
- public static final int ORDER_TYPE_CANCEL = -1;
+ public static final int ORDER_STATUS_SUCCESS = 1;
/**
* 订单类型 开多
@@ -75,11 +82,16 @@
private int tradeType;
/**
- * 订单类型 - 0撤单,1开多,2开空,3平多,4平空
+ * 订单类型 - 1开多,2开空,3平多,4平空
*/
private int orderType;
/**
+ * 订单状态 - 1成交 2撤单
+ */
+ private int orderStatus = 1;
+
+ /**
* 委托开仓价
*/
private BigDecimal entrustOpeningPrice;
--
Gitblit v1.9.1