From c03c9ec120c24f077a4805f8cf88cf17bb9d922e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 09 Jul 2020 20:05:23 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin

---
 src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java
index a518d60..221d480 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java
@@ -60,4 +60,16 @@
     @ApiModelProperty("强平价")
     private BigDecimal forceClosingPrice;
 
+    @ApiModelProperty(value = "交易类型 1-市价 2-限价")
+    private Integer tradeType;
+
+    public BigDecimal getOpeningFeeAmount() {
+        return openingFeeAmount == null ? openingFeeAmount : openingFeeAmount.setScale(8, BigDecimal.ROUND_DOWN);
+    }
+
+
+    public BigDecimal getClosingFeeAmount() {
+        return closingFeeAmount == null ? closingFeeAmount : closingFeeAmount.setScale(8, BigDecimal.ROUND_DOWN);
+    }
+
 }

--
Gitblit v1.9.1