From a00d810984fe187d24e442d5f557bcc271cfa3ce Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 28 Jan 2021 11:25:49 +0800
Subject: [PATCH] Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin.git into whole_new
---
src/main/java/com/xcong/excoin/modules/contract/entity/ContractOrderEntity.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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 2060785..fd6ae5b 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;
@@ -33,6 +36,11 @@
public static final int ORDER_STATUS_CANCEL = 2;
/**
+ * 订单状态 成交
+ */
+ public static final int ORDER_STATUS_SUCCESS = 1;
+
+ /**
* 订单类型 开多
*/
public static final int ORDER_TYPE_OPEN_MORE = 1;
@@ -52,7 +60,12 @@
*/
public static final int ORDER_TYPE_CLOSE_LESS = 4;
-
+ /**
+ * 订单类型1普通合约2跟单合约
+ */
+ private int contractType;
+ public static final int CONTRACTTYPE_NORMAL = 1;
+ public static final int CONTRACTTYPE_DOCUMENTARY = 2;
/**
* 会员Id
*/
@@ -81,7 +94,7 @@
/**
* 订单状态 - 1成交 2撤单
*/
- private int orderStatus;
+ private int orderStatus = 1;
/**
* 委托开仓价
@@ -192,4 +205,9 @@
private int operateNo;
+ /**
+ * 维持保证金
+ */
+ private BigDecimal holdBond;
+
}
--
Gitblit v1.9.1