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/ContractOrderEntity.java | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/entity/ContractOrderEntity.java b/src/main/java/com/xcong/excoin/modules/trademanage/entity/ContractOrderEntity.java
index 468c481..234541d 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/entity/ContractOrderEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/entity/ContractOrderEntity.java
@@ -5,10 +5,13 @@
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 lombok.Data;
+import com.xcong.excoin.common.utils.BigDecimalSerialize;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.Data;
@Data
@TableName("contract_order")
public class ContractOrderEntity extends BaseEntity {/**
@@ -89,6 +92,7 @@
/**
* 委托开仓价
*/
+ @JsonSerialize(using = BigDecimalSerialize.class)
private BigDecimal entrustOpeningPrice;
/**
@@ -114,11 +118,13 @@
/**
* 平仓价
*/
+ @JsonSerialize(using = BigDecimalSerialize.class)
private BigDecimal closingPrice;
/**
* 平仓手续费
*/
+ @JsonSerialize(using = BigDecimalSerialize.class)
private BigDecimal closingFeeAmount;
/**
@@ -132,6 +138,11 @@
private int closingType;
/**
+ * 1普通合约2跟单合约
+ */
+ private int contractType;
+
+ /**
* 杠杆倍率
*/
private int leverRatio;
@@ -139,31 +150,39 @@
/**
* 止损价
*/
+ @JsonSerialize(using = BigDecimalSerialize.class)
private BigDecimal stopLossPrice;
/**
* 止盈价
*/
+ @JsonSerialize(using = BigDecimalSerialize.class)
private BigDecimal stopProfitPrice;
+
/**
* 盈亏金额
*/
+ @JsonSerialize(using = BigDecimalSerialize.class)
private BigDecimal rewardAmount;
/**
* 盈亏比例
*/
- private BigDecimal rewardRatio;
- /**
+ @JsonSerialize(using = BigDecimalSerialize.class)
+ private BigDecimal rewardRatio;
+
+ /**
* 开仓价
*/
+ @JsonSerialize(using = BigDecimalSerialize.class)
private BigDecimal openingPrice;
/**
* 开仓手续费
*/
+ @JsonSerialize(using = BigDecimalSerialize.class)
private BigDecimal openingFeeAmount;
private Date openingTime;
@@ -171,26 +190,32 @@
/**
* 预付款金额
*/
+
+ @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;
/**
* 持仓费
*/
+ @JsonSerialize(using = BigDecimalSerialize.class)
private BigDecimal holdAmount;
private int operateNo;
@@ -212,6 +237,22 @@
*/
@TableField(exist = false)
private String inviteId;
+
+ /**
+ * 账号类型
+ */
+ @TableField(exist = false)
+ private int accountType;
+ /**
+ * 姓名
+ */
+ @TableField(exist = false)
+ private String realName;
+ /**
+ * 查询条件：账号类型
+ */
+ @TableField(exist = false)
+ private String isTest;
}
--
Gitblit v1.9.1