From 8acb28f8ef070a90be79f4d7ef09bcefadb6f27f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Apr 2021 15:04:20 +0800
Subject: [PATCH] 20210423

---
 src/main/java/com/xcong/excoin/modules/contract/entity/ContractOrderEntity.java |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 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 1f94782..382c465 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
@@ -2,11 +2,14 @@
 
 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;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 合约订单历史表
@@ -92,6 +95,7 @@
     /**
      * 委托开仓价
      */
+    @JsonSerialize(using = BigDecimalSerialize.class)
     private BigDecimal entrustOpeningPrice;
 
     /**
@@ -112,16 +116,19 @@
     /**
      * 币种规格
      */
+    @JsonSerialize(using = BigDecimalSerialize.class)
     private BigDecimal symbolSku;
 
     /**
      * 平仓价
      */
+    @JsonSerialize(using = BigDecimalSerialize.class)
     private BigDecimal closingPrice;
 
     /**
      * 平仓手续费
      */
+    @JsonSerialize(using = BigDecimalSerialize.class)
     private BigDecimal closingFeeAmount;
 
     /**
@@ -142,31 +149,37 @@
     /**
      * 止损价
      */
+    @JsonSerialize(using = BigDecimalSerialize.class)
     private BigDecimal stopLossPrice;
 
     /**
      * 止盈价
      */
+    @JsonSerialize(using = BigDecimalSerialize.class)
     private BigDecimal stopProfitPrice;
 
     /**
      * 盈亏金额
      */
+    @JsonSerialize(using = BigDecimalSerialize.class)
     private BigDecimal rewardAmount;
 
     /**
      * 盈亏比例
      */
+    @JsonSerialize(using = BigDecimalSerialize.class)
     private BigDecimal rewardRatio;
 
     /**
      * 开仓价
      */
+    @JsonSerialize(using = BigDecimalSerialize.class)
     private BigDecimal openingPrice;
 
     /**
      * 开仓手续费
      */
+    @JsonSerialize(using = BigDecimalSerialize.class)
     private BigDecimal openingFeeAmount;
 
     private Date openingTime;
@@ -174,26 +187,36 @@
     /**
      * 预付款金额
      */
+    @JsonSerialize(using = BigDecimalSerialize.class)
     private BigDecimal prePaymentAmount;
 
     /**
      * 保证金
      */
+    @JsonSerialize(using = BigDecimalSerialize.class)
     private BigDecimal bondAmount;
 
     /**
      * 市场价
      */
+    @JsonSerialize(using = BigDecimalSerialize.class)
     private BigDecimal markPrice;
 
     /**
      * 预估强平价
      */
+    @JsonSerialize(using = BigDecimalSerialize.class)
     private BigDecimal forceClosingPrice;
+
+    /**
+     * 1普通合约2跟单合约
+     */
+    private int contractType;
 
     /**
      * 持仓费
      */
+    @JsonSerialize(using = BigDecimalSerialize.class)
     private BigDecimal holdAmount;
 
     private int operateNo;
@@ -211,6 +234,14 @@
 
     @TableField(exist = false)
     private String timeType;
+    /**
+     * 盈亏金额返利
+     */
+    @TableField(exist = false)
+    @JsonSerialize(using = BigDecimalSerialize.class)
+    private BigDecimal rewardAmountProfit;
+    @TableField(exist = false)
+    private List<Long> IDs;
 
 
 }

--
Gitblit v1.9.1