From 71b049a8efeb7c887138e51a04259e32e72a8db2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 13 Sep 2020 03:47:59 +0800
Subject: [PATCH] modify

---
 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 86a2dbb..e06bff3 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,11 +1,13 @@
 package com.xcong.excoin.modules.contract.parameter.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @author wzy
@@ -57,16 +59,27 @@
     @ApiModelProperty(value = "可减少最大保证金")
     private BigDecimal canReduceMaxBond;
 
-    public BigDecimal getOpeningPrice() {
-        return openingPrice.setScale(4, BigDecimal.ROUND_DOWN);
+    @ApiModelProperty(value = "开仓时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    @ApiModelProperty(value = "交易类型 1-市价 2-限价")
+    private Integer tradeType;
+
+    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