From f6a912c1a6a26c809568f964941fb4ad4483274e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 31 May 2021 11:19:40 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 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 6fb8d26..fde98fd 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
@@ -1,6 +1,7 @@
package com.xcong.excoin.modules.contract.parameter.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xcong.excoin.utils.CommonUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -18,6 +19,9 @@
@ApiModelProperty("交易类型 1-市价2-限价")
private int tradeType;
+
+ @ApiModelProperty("仓位类型 1-逐仓 2-全仓")
+ private int positionType;
@ApiModelProperty("订单类型 -1撤单,1开多,2开空,3平多,4平空")
private int orderType;
@@ -82,31 +86,43 @@
private int leverRatio;
public String getClosingPrice() {
- return closingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return CommonUtils.amountDotFormat(this.symbol, closingPrice);
}
public String getClosingFeeAmount() {
- return closingFeeAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return closingFeeAmount == null ? "" : closingFeeAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getRewardAmount() {
- return rewardAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return rewardAmount == null ? "" : rewardAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getOpeningPrice() {
- return openingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return CommonUtils.amountDotFormat(this.symbol, openingPrice);
}
public String getOpeningFeeAmount() {
- return openingFeeAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return openingFeeAmount == null ? "" : openingFeeAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getBondAmount() {
- return bondAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return bondAmount == null ? "" : bondAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getHoldAmount() {
- return holdAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return holdAmount == null ? "" : holdAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
+ }
+
+ public String getStopLossPrice() {
+ return CommonUtils.amountDotFormat(this.symbol, stopLossPrice);
+ }
+
+ public String getStopProfitPrice() {
+ return CommonUtils.amountDotFormat(this.symbol, stopProfitPrice);
+ }
+
+ public String getEntrustOpeningPrice() {
+ return CommonUtils.amountDotFormat(this.symbol, entrustOpeningPrice);
}
public void setClosingFeeAmount(BigDecimal closingFeeAmount, BigDecimal feeSpread) {
--
Gitblit v1.9.1