From 1498b23be871aec99314da998569a94c9ab53607 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 29 Oct 2020 17:56:37 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java | 28 ++++++++++++++++++++++------
1 files changed, 22 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 31eff3f..e5310e6 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,5 +1,7 @@
package com.xcong.excoin.modules.contract.parameter.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xcong.excoin.common.enumerates.SymbolsPlacesEnum;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -46,6 +48,9 @@
@ApiModelProperty(value = "张数")
private int symbolCnt;
+ @ApiModelProperty(value = "可平张数")
+ private int symbolCntSale;
+
@ApiModelProperty(value = "回报率")
private BigDecimal returnRate;
@@ -59,18 +64,29 @@
private BigDecimal canReduceMaxBond;
@ApiModelProperty(value = "开仓时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
- public BigDecimal getOpeningPrice() {
- return openingPrice.setScale(4, BigDecimal.ROUND_DOWN);
+ @ApiModelProperty(value = "交易类型 1-市价 2-限价")
+ private Integer tradeType;
+
+ @ApiModelProperty(value = "仓位类型 1-逐仓 2-全仓")
+ private Integer positionType;
+
+ public String getOpeningPrice() {
+ return openingPrice.setScale(SymbolsPlacesEnum.getValueByName(this.symbol), BigDecimal.ROUND_DOWN).toPlainString();
}
- public BigDecimal getBondAmount() {
- return bondAmount.setScale(4, BigDecimal.ROUND_DOWN);
+ public String getBondAmount() {
+ return bondAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
}
- public BigDecimal getForceClosingPrice() {
- return forceClosingPrice.setScale(4, BigDecimal.ROUND_DOWN);
+ public String getForceClosingPrice() {
+ return forceClosingPrice.setScale(SymbolsPlacesEnum.getValueByName(this.symbol), BigDecimal.ROUND_DOWN).toPlainString();
+ }
+
+ public String getProfitOrLoss() {
+ return profitOrLoss.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
}
public BigDecimal getCanAddMaxBond() {
--
Gitblit v1.9.1