From 36be00e0f3cbe0d559c646fd2977e6e3a74aa6f9 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Mon, 30 Sep 2024 16:57:22 +0800 Subject: [PATCH] Merge branch 'bea' of http://120.27.238.55:7000/r/exchange into bea --- src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java | 40 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 39 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java index 25f363d..b35f899 100644 --- a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java +++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java @@ -22,6 +22,9 @@ @ApiModelProperty("订单类型 -1撤单,1开多,2开空,3平多,4平空") private int orderType; + @ApiModelProperty("仓位类型 1-逐仓 2-全仓") + private int positionType; + @ApiModelProperty("订单编号") private String orderNo; @@ -51,7 +54,7 @@ private int closingType; @ApiModelProperty("止损价") - private BigDecimal stopLosePrice; + private BigDecimal stopLossPrice; @ApiModelProperty("止盈价") private BigDecimal stopProfitPrice; @@ -81,4 +84,39 @@ @ApiModelProperty("杠杆") private int leverRatio; + public String getClosingPrice() { + return closingPrice == null ? "" : closingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString(); + } + + public String getClosingFeeAmount() { + return closingFeeAmount == null ? "" : closingFeeAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString(); + } + + public String getRewardAmount() { + return rewardAmount == null ? "" : rewardAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString(); + } + + public String getOpeningPrice() { + return openingPrice == null ? "" : openingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString(); + } + + public String getOpeningFeeAmount() { + return openingFeeAmount == null ? "" : openingFeeAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString(); + } + + public String getBondAmount() { + return bondAmount == null ? "" : bondAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString(); + } + + public String getHoldAmount() { + return holdAmount == null ? "" : holdAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString(); + } + + public void setClosingFeeAmount(BigDecimal closingFeeAmount, BigDecimal feeSpread) { + this.closingFeeAmount = closingFeeAmount == null ? closingFeeAmount : closingFeeAmount.multiply(feeSpread).setScale(8, BigDecimal.ROUND_DOWN); + } + + public void setOpeningFeeAmount(BigDecimal openingFeeAmount, BigDecimal feeSpread) { + this.openingFeeAmount = openingFeeAmount == null ? openingFeeAmount : openingFeeAmount.multiply(feeSpread).setScale(8, BigDecimal.ROUND_DOWN); + } } -- Gitblit v1.9.1