From 829f629756e5402bcd3e9f6ef1f9c6dbffbabb11 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Wed, 17 Apr 2024 14:46:29 +0800 Subject: [PATCH] 55测试环境 --- src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderDetailVo.java | 29 ++++++++++++++++++++++++----- 1 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderDetailVo.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderDetailVo.java index b568643..93eb7ee 100644 --- a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderDetailVo.java +++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderDetailVo.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; @@ -19,9 +20,15 @@ @ApiModelProperty("订单编号") private String orderNo; + + @ApiModelProperty("仓位类型 1-逐仓 2-全仓") + private int positionType; @ApiModelProperty("交易类型 1-市价2-限价") private int tradeType; + + @ApiModelProperty("可平张数(仅全仓模式)") + private int symbolCntSale; @ApiModelProperty("币种") private String symbol; @@ -64,22 +71,34 @@ private int leverRatio; public String getOpeningPrice() { - return openingPrice == null ? "" : openingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString(); + return CommonUtils.amountDotFormat(this.symbol, openingPrice); } public String getOpeningFeeAmount() { - return openingFeeAmount == null ? "" : openingFeeAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString(); + return openingFeeAmount == null ? "" : openingFeeAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString(); } public String getBondAmount() { - return bondAmount == null ? "" : bondAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString(); + return bondAmount == null ? "" : bondAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString(); } public String getHoldAmount() { - return holdAmount == null ? "" : holdAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString(); + return holdAmount == null ? "" : holdAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString(); } public String getForceClosingPrice() { - return forceClosingPrice == null ? "" : forceClosingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString(); + return CommonUtils.amountDotFormat(this.symbol, forceClosingPrice); + } + + public String getStopLossPrice() { + return CommonUtils.amountDotFormat(this.symbol, stopLossPrice); + } + + public String getStopProfitPrice() { + return CommonUtils.amountDotFormat(this.symbol, stopProfitPrice); + } + + public void setOpeningFeeAmount(BigDecimal openingFeeAmount, BigDecimal feeSpread) { + this.openingFeeAmount = openingFeeAmount == null ? openingFeeAmount : openingFeeAmount.multiply(feeSpread).setScale(8, BigDecimal.ROUND_DOWN); } } -- Gitblit v1.9.1