From cf200a1f92c01ba22c326c49391f748ffb006910 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 05 Jul 2021 17:28:35 +0800
Subject: [PATCH] 20210617  开售开关

---
 src/main/java/com/xcong/excoin/modules/trademanage/entity/ContractHoldOrderEntity.java |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/entity/ContractHoldOrderEntity.java b/src/main/java/com/xcong/excoin/modules/trademanage/entity/ContractHoldOrderEntity.java
index 84bed69..14cd814 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/entity/ContractHoldOrderEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/entity/ContractHoldOrderEntity.java
@@ -4,7 +4,9 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.xcong.excoin.common.entity.BaseEntity;
+import com.xcong.excoin.common.utils.BigDecimalSerialize;
 
 import lombok.Data;
 
@@ -94,6 +96,7 @@
     /**
      * 开仓价
      */
+    @JsonSerialize(using = BigDecimalSerialize.class)
     private BigDecimal openingPrice;
 
     /**
@@ -102,13 +105,22 @@
     private int openingType;
 
     /**
+     * 1普通合约2跟单合约
+     */
+    private int contractType;
+    public static final int CONTRACTTYPE_NORMAL = 1;
+    public static final int CONTRACTTYPE_FOLLOW = 2;
+
+    /**
      * 开仓手续费
      */
+    @JsonSerialize(using = BigDecimalSerialize.class)
     private BigDecimal openingFeeAmount;
 
     /**
      * 保证金
      */
+    @JsonSerialize(using = BigDecimalSerialize.class)
     private BigDecimal bondAmount;
 
     /**
@@ -119,26 +131,37 @@
     /**
      * 市场价
      */
+    @JsonSerialize(using = BigDecimalSerialize.class)
     private BigDecimal markPrice;
 
     /**
      * 止损价
      */
+    @JsonSerialize(using = BigDecimalSerialize.class)
     private BigDecimal stopLossPrice;
 
     /**
      * 止盈价
      */
+    @JsonSerialize(using = BigDecimalSerialize.class)
     private BigDecimal stopProfitPrice;
 
     /**
      * 预付款金额
      */
+    @JsonSerialize(using = BigDecimalSerialize.class)
     private BigDecimal prePaymentAmount;
+    
+    /**
+     * 持仓费
+     */
+    @JsonSerialize(using = BigDecimalSerialize.class)
+    private BigDecimal holdAmount;
 
     /**
      * 预估强平价
      */
+    @JsonSerialize(using = BigDecimalSerialize.class)
     private BigDecimal forceClosingPrice;
 
     private int operateNo;
@@ -171,9 +194,15 @@
 	@TableField(exist = false)
     private String inviteId;
 	/**
+     * 交易员邀请码
+     */
+	@TableField(exist = false)
+	private String inviteIdTrader;
+	/**
 	 * 系统盈亏
 	 */
 	@TableField(exist = false)
+    @JsonSerialize(using = BigDecimalSerialize.class)
 	private BigDecimal rewardRatio;
 	/**
 	 * 姓名
@@ -185,4 +214,9 @@
 	 */
 	@TableField(exist = false)
 	private int accountType;
+	/**
+	 * 查询条件:账号类型
+	 */
+	@TableField(exist = false)
+    private String isTest;
 }

--
Gitblit v1.9.1