From 11dfc3615f5d6902f96dc8be9d6c3b0f347dbe2d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 30 Mar 2021 14:58:20 +0800
Subject: [PATCH] modify bond amount
---
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java
index e06bff3..e697860 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.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.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -47,6 +48,9 @@
@ApiModelProperty(value = "张数")
private int symbolCnt;
+ @ApiModelProperty(value = "可平张数")
+ private int symbolCntSale;
+
@ApiModelProperty(value = "回报率")
private BigDecimal returnRate;
@@ -66,20 +70,30 @@
@ApiModelProperty(value = "交易类型 1-市价 2-限价")
private Integer tradeType;
+ @ApiModelProperty(value = "仓位类型 1-逐仓 2-全仓")
+ private Integer positionType;
+
+ @ApiModelProperty(value = "维持保证金")
+ private BigDecimal holdBond;
+
+ @ApiModelProperty(value = "手续费")
+ private BigDecimal openingFeeAmount;
+
public String getOpeningPrice() {
- return openingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+
+ return CommonUtils.amountDotFormat(this.symbol, openingPrice);
}
public String getBondAmount() {
- return bondAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return bondAmount == null ? "" : bondAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getForceClosingPrice() {
- return forceClosingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return CommonUtils.amountDotFormat(this.symbol, forceClosingPrice);
}
public String getProfitOrLoss() {
- return profitOrLoss.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return profitOrLoss.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
}
public BigDecimal getCanAddMaxBond() {
--
Gitblit v1.9.1