From 18aab7d6156b93d65c1b18809d924cbb214d737a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 26 Feb 2021 16:04:03 +0800
Subject: [PATCH] Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole_new
---
src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 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 c39e3d1..18ac9ea 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
@@ -1,5 +1,6 @@
package com.xcong.excoin.modules.contract.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.xcong.excoin.common.system.base.BaseEntity;
import lombok.Data;
@@ -58,7 +59,7 @@
/**
* 仓位类型 1-逐仓 2-全仓
*/
- private int potionType;
+ private int positionType;
/**
* 交易类型 1-市价 2-限价
@@ -146,4 +147,25 @@
* 批次号 队列平仓时使用，避免重复
*/
public String batchNo;
+
+ /**
+ * 持仓费
+ */
+ private BigDecimal holdAmount;
+
+ /**
+ * 合约类型 1-普通合约 2-跟单合约
+ */
+ private Integer contractType;
+
+ /**
+ * 已实现盈亏
+ */
+// @TableField(exist = false)
+ private BigDecimal rewardAmount;
+
+ /**
+ * 维持保证金
+ */
+ private BigDecimal holdBond;
}
--
Gitblit v1.9.1