From adb99db2cb5359416713a1bd3a13423ddf0f0d80 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 25 Aug 2020 19:26:46 +0800 Subject: [PATCH] modify whole close order --- src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java index 37832fe..48cc3ba 100644 --- a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java +++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.web3j.abi.datatypes.Int; import java.math.BigDecimal; import java.util.Date; @@ -41,6 +42,9 @@ @ApiModelProperty("张数") private int symbolCnt; + @ApiModelProperty("可平张数") + private int symbolCntSale; + @ApiModelProperty("已实现盈亏") private BigDecimal rewardAmount; @@ -54,7 +58,32 @@ @ApiModelProperty("平仓时间") private Date closingTime; + @ApiModelProperty("平仓价格") + private BigDecimal closingPrice; + @ApiModelProperty("强平价") private BigDecimal forceClosingPrice; + @ApiModelProperty(value = "交易类型 1-市价 2-限价") + private Integer tradeType; + + @ApiModelProperty(value = "合约类型 1-普通 2-跟单") + private Integer contractType; + + public String getOpeningFeeAmount() { + return openingFeeAmount == null ? "" : openingFeeAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString(); + } + + + public String getClosingFeeAmount() { + return closingFeeAmount == null ? "" : closingFeeAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString(); + } + + public String getBondAmount() { + return bondAmount == null ? "" : bondAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString(); + } + + public String getRewardAmount() { + return rewardAmount == null ? "" : rewardAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString(); + } } -- Gitblit v1.9.1