From 19a0ffbf9653be38d3f366fc25cda8357e534086 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 26 Mar 2021 10:03:37 +0800
Subject: [PATCH] Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity
---
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java | 66 ++++++++++++++++++++++++++++++---
1 files changed, 60 insertions(+), 6 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 bdaef3e..e0adbad 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,11 +1,14 @@
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;
import lombok.Data;
import java.math.BigDecimal;
+import java.util.Date;
/**
* @author wzy
@@ -45,6 +48,9 @@
@ApiModelProperty(value = "张数")
private int symbolCnt;
+ @ApiModelProperty(value = "可平张数")
+ private int symbolCntSale;
+
@ApiModelProperty(value = "回报率")
private BigDecimal returnRate;
@@ -54,19 +60,67 @@
@ApiModelProperty(value = "可增加的最大保证金")
private BigDecimal canAddMaxBond;
- public BigDecimal getOpeningPrice() {
- return openingPrice.setScale(4, BigDecimal.ROUND_DOWN);
+ @ApiModelProperty(value = "可减少最大保证金")
+ private BigDecimal canReduceMaxBond;
+
+ @ApiModelProperty(value = "开仓时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ @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 CommonUtils.amountDotFormat(this.symbol, openingPrice);
}
- public BigDecimal getBondAmount() {
- return bondAmount.setScale(4, BigDecimal.ROUND_DOWN);
+ private String dotFormat(BigDecimal price) {
+ String priceFormat = "";
+ switch (this.symbol) {
+ case "BTC/USDT":
+ case "ETH/USDT":
+ case "LTC/USDT":
+ case "BCH/USDT":
+ priceFormat = price.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
+ break;
+ case "EOS/USDT":
+ case "XRP/USDT":
+ case "ETC/USDT":
+ priceFormat = price.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ break;
+ default:
+ priceFormat = price.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
+ }
+ return priceFormat;
}
- public BigDecimal getForceClosingPrice() {
- return forceClosingPrice.setScale(4, BigDecimal.ROUND_DOWN);
+ public String getBondAmount() {
+ return CommonUtils.amountDotFormat(this.symbol, bondAmount);
+ }
+
+ public String getForceClosingPrice() {
+ return CommonUtils.amountDotFormat(this.symbol, forceClosingPrice);
+ }
+
+ public String getProfitOrLoss() {
+ return profitOrLoss.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
}
public BigDecimal getCanAddMaxBond() {
return canAddMaxBond.setScale(4, BigDecimal.ROUND_DOWN);
}
+
+ public BigDecimal getCanReduceMaxBond() {
+ return canReduceMaxBond.setScale(4, BigDecimal.ROUND_DOWN);
+ }
}
--
Gitblit v1.9.1