From 9e6054ca0612a05ec2b698b8a63db7605c600725 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 05 Mar 2021 14:51:08 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java
index e33dce0..0a0a8f4 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java
@@ -18,6 +18,9 @@
@ApiModelProperty("交易类型 1-市价2-限价")
private int tradeType;
+
+ @ApiModelProperty("仓位类型 1-逐仓 2-全仓")
+ private int positionType;
@ApiModelProperty("订单类型 -1撤单,1开多,2开空,3平多,4平空")
private int orderType;
@@ -82,30 +85,38 @@
private int leverRatio;
public String getClosingPrice() {
- return closingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return closingPrice == null ? "" : closingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getClosingFeeAmount() {
- return closingFeeAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return closingFeeAmount == null ? "" : closingFeeAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getRewardAmount() {
- return rewardAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return rewardAmount == null ? "" : rewardAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getOpeningPrice() {
- return openingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return openingPrice == null ? "" : openingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getOpeningFeeAmount() {
- return openingFeeAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return openingFeeAmount == null ? "" : openingFeeAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getBondAmount() {
- return bondAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return bondAmount == null ? "" : bondAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getHoldAmount() {
- return holdAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return holdAmount == null ? "" : holdAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ }
+
+ public void setClosingFeeAmount(BigDecimal closingFeeAmount, BigDecimal feeSpread) {
+ this.closingFeeAmount = closingFeeAmount == null ? closingFeeAmount : closingFeeAmount.multiply(feeSpread).setScale(8, BigDecimal.ROUND_DOWN);
+ }
+
+ public void setOpeningFeeAmount(BigDecimal openingFeeAmount, BigDecimal feeSpread) {
+ this.openingFeeAmount = openingFeeAmount == null ? openingFeeAmount : openingFeeAmount.multiply(feeSpread).setScale(8, BigDecimal.ROUND_DOWN);
}
}
--
Gitblit v1.9.1