From 705635efdd5000152d9c4423ae980ccdc34632a8 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Tue, 23 Feb 2021 20:42:19 +0800
Subject: [PATCH] 波长jar包删除日志配置文件
---
src/main/java/com/xcong/excoin/modules/contract/entity/ContractOrderEntity.java | 25 +++++++++++++++++++++----
1 files changed, 21 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..a59fe55 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;
/**
* 订单类型 开多
@@ -53,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
*/
@@ -75,11 +87,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