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/HoldOrderListVo.java |   27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 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 7a6d2bd..9bd38ed 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,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;
@@ -47,6 +48,9 @@
     @ApiModelProperty(value = "张数")
     private int symbolCnt;
 
+    @ApiModelProperty(value = "可平张数")
+    private int symbolCntSale;
+
     @ApiModelProperty(value = "回报率")
     private BigDecimal returnRate;
 
@@ -69,20 +73,35 @@
     @ApiModelProperty(value = "仓位类型 1-逐仓 2-全仓")
     private Integer positionType;
 
+    @ApiModelProperty(value = "维持保证金")
+    private BigDecimal holdBond;
+
+    @ApiModelProperty(value = "手续费")
+    private BigDecimal openingFeeAmount;
+
     public String getOpeningPrice() {
-        return openingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+
+        return CommonUtils.amountDotFormat(this.symbol, openingPrice);
+    }
+
+    public String getStopLossPrice() {
+        return CommonUtils.amountDotFormat(this.symbol, stopLossPrice);
+    }
+
+    public String getStopProfitPrice() {
+        return CommonUtils.amountDotFormat(this.symbol, stopProfitPrice);
     }
 
     public String getBondAmount() {
-        return bondAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+        return bondAmount == null ? "" : bondAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
     }
 
     public String getForceClosingPrice() {
-        return forceClosingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+        return CommonUtils.amountDotFormat(this.symbol, forceClosingPrice);
     }
 
     public String getProfitOrLoss() {
-        return profitOrLoss.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+        return profitOrLoss.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
     }
 
     public BigDecimal getCanAddMaxBond() {

--
Gitblit v1.9.1