From 705635efdd5000152d9c4423ae980ccdc34632a8 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Tue, 23 Feb 2021 20:42:19 +0800
Subject: [PATCH] 波长jar包删除日志配置文件

---
 src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java |   25 +++++++++++++++++++------
 1 files changed, 19 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 e8dd9ad..0e924ca 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
@@ -47,6 +47,9 @@
     @ApiModelProperty(value = "张数")
     private int symbolCnt;
 
+    @ApiModelProperty(value = "可平张数")
+    private int symbolCntSale;
+
     @ApiModelProperty(value = "回报率")
     private BigDecimal returnRate;
 
@@ -63,16 +66,26 @@
     @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(4, 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(4, BigDecimal.ROUND_DOWN).toPlainString();
+    }
+
+    public String getProfitOrLoss() {
+        return profitOrLoss.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
     }
 
     public BigDecimal getCanAddMaxBond() {

--
Gitblit v1.9.1