From f5e6133809c553cfd9fb28ee61019927c547c374 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Wed, 08 Dec 2021 15:58:33 +0800 Subject: [PATCH] 20211208 fish --- src/main/java/com/xcong/excoin/modules/contract/entity/ContractOrderEntity.java | 42 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 38 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 938bfd4..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,35 @@ */ 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; + + /** + * 订单类型 开多 + */ + public static final int ORDER_TYPE_OPEN_MORE = 1; + + /** + * 订单类型 开空 + */ + public static final int ORDER_TYPE_OPEN_LESS = 2; + + /** + * 订单类型 平多 + */ + public static final int ORDER_TYPE_CLOSE_MORE = 3; + + /** + * 订单类型 平空 + */ + public static final int ORDER_TYPE_CLOSE_LESS = 4; /** @@ -47,7 +74,7 @@ /** * 仓位类型 1-逐仓 2-全仓 */ - private int potionType; + private int positionType; /** * 交易类型 1-市价 2-限价 @@ -55,9 +82,14 @@ private int tradeType; /** - * 订单类型 - 0撤单,1开多,2开空,3平多,4平空,5委托开多,6委托开空,7委托平多,8委托平空,9爆仓平多,10爆仓平空 + * 订单类型 - 1开多,2开空,3平多,4平空 */ private int orderType; + + /** + * 订单状态 - 1成交 2撤单 + */ + private int orderStatus = 1; /** * 委托开仓价 @@ -139,6 +171,8 @@ */ private BigDecimal openingFeeAmount; + private Date openingTime; + /** * 预付款金额 */ -- Gitblit v1.9.1