From 36be00e0f3cbe0d559c646fd2977e6e3a74aa6f9 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 30 Sep 2024 16:57:22 +0800
Subject: [PATCH] Merge branch 'bea' of http://120.27.238.55:7000/r/exchange into bea
---
src/main/java/com/xcong/excoin/modules/contract/entity/ContractOrderEntity.java | 64 ++++++++++++++++++++++++++++++--
1 files changed, 60 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 59b0212..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;
@@ -14,8 +17,49 @@
* @date 2020-05-27
**/
@Data
-@TableName("contract_order_entity")
+@TableName("contract_order")
public class ContractOrderEntity extends BaseEntity {
+
+ /**
+ * 交易类型 市价
+ */
+ public static final int TRADE_TYPE_MARK_PRICE = 1;
+
+ /**
+ * 交易类型 限价
+ */
+ public static final int TRADE_TYPE_LIMIT_PRICE = 2;
+
+ /**
+ * 订单状态 撤单
+ */
+ 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;
+
+ /**
+ * 订单类型 开空
+ */
+ 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;
+
/**
* 会员Id
@@ -30,7 +74,7 @@
/**
* 仓位类型 1-逐仓 2-全仓
*/
- private int potionType;
+ private int positionType;
/**
* 交易类型 1-市价 2-限价
@@ -38,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;
/**
* 委托开仓价
@@ -65,7 +114,7 @@
/**
* 币种规格
*/
- private Long symbolSku;
+ private BigDecimal symbolSku;
/**
* 平仓价
@@ -81,6 +130,11 @@
* 平仓时间
*/
private Date closingTime;
+
+ /**
+ * 平仓类型 2平多3平空4爆仓平多5爆仓平空6止盈平多7止盈平空8止损平多9止损平空
+ */
+ private int closingType;
/**
* 杠杆倍率
@@ -117,6 +171,8 @@
*/
private BigDecimal openingFeeAmount;
+ private Date openingTime;
+
/**
* 预付款金额
*/
--
Gitblit v1.9.1