From 8fd540a4a03dd32cb66bf1e0fc5fac3e0b214515 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 31 May 2020 22:23:31 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin.git

---
 src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java |   28 ++++++++++++++++++++++++----
 1 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java b/src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java
index 989a8ca..52166a3 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java
@@ -26,6 +26,26 @@
     public static final int ORDER_CAN_CLOSING_N = 0;
 
     /**
+     * 开多
+     */
+    public static final int OPENING_TYPE_MORE = 1;
+
+    /**
+     * 开空
+     */
+    public static final int OPENING_TYPE_LESS = 2;
+
+    /**
+     * 交易类型 市价
+     */
+    public static final int TRADE_TYPE_MARK = 1;
+
+    /**
+     * 交易类型 限价
+     */
+    public static final int TRADE_TYPE_LIMIT = 2;
+
+    /**
      * 会员Id
      */
     private Long memberId;
@@ -38,7 +58,7 @@
     /**
      * 仓位类型 1-逐仓 2-全仓
      */
-    private int potionType;
+    private int positionType;
 
     /**
      * 交易类型 1-市价 2-限价
@@ -63,7 +83,7 @@
     /**
      * 币种规格
      */
-    private Long symbolSku;
+    private BigDecimal symbolSku;
 
     /**
      * 开仓价
@@ -71,7 +91,7 @@
     private BigDecimal openingPrice;
 
     /**
-     * 开仓类型 1-开多 2-开多
+     * 开仓类型 1-开多 2-开空
      */
     private int openingType;
 
@@ -83,7 +103,7 @@
     /**
      * 保证金
      */
-    private BigDecimal bondPrice;
+    private BigDecimal bondAmount;
 
     /**
      * 杠杆倍率

--
Gitblit v1.9.1