From d0ae7aaed97300f4cbefb9542f041f0c72d5edf3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 04 Mar 2021 11:27:39 +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/parameter/vo/HoldOrderDetailVo.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderDetailVo.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderDetailVo.java
index b568643..908c6b0 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderDetailVo.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderDetailVo.java
@@ -19,9 +19,15 @@
@ApiModelProperty("订单编号")
private String orderNo;
+
+ @ApiModelProperty("仓位类型 1-逐仓 2-全仓")
+ private int positionType;
@ApiModelProperty("交易类型 1-市价2-限价")
private int tradeType;
+
+ @ApiModelProperty("可平张数(仅全仓模式)")
+ private int symbolCntSale;
@ApiModelProperty("币种")
private String symbol;
@@ -82,4 +88,8 @@
public String getForceClosingPrice() {
return forceClosingPrice == null ? "" : forceClosingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
}
+
+ public void setOpeningFeeAmount(BigDecimal openingFeeAmount, BigDecimal feeSpread) {
+ this.openingFeeAmount = openingFeeAmount == null ? openingFeeAmount : openingFeeAmount.multiply(feeSpread).setScale(8, BigDecimal.ROUND_DOWN);
+ }
}
--
Gitblit v1.9.1