From d6e668861fe09bce595ed6ea9746ed733fbcb606 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 12 Aug 2020 19:02:44 +0800
Subject: [PATCH] Merge branch 'whole' of https://gitee.com/chonggaoxiao/new_excoin into whole
---
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java | 8 ++++++++
1 files changed, 8 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 ef77cc6..9171e94 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
@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.web3j.abi.datatypes.Int;
import java.math.BigDecimal;
import java.util.Date;
@@ -63,6 +64,9 @@
@ApiModelProperty(value = "交易类型 1-市价 2-限价")
private Integer tradeType;
+ @ApiModelProperty(value = "合约类型 1-普通 2-跟单")
+ private Integer contractType;
+
public String getOpeningFeeAmount() {
return openingFeeAmount == null ? "" : openingFeeAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
}
@@ -75,4 +79,8 @@
public String getBondAmount() {
return bondAmount == null ? "" : bondAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
}
+
+ public String getRewardAmount() {
+ return rewardAmount == null ? "" : rewardAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ }
}
--
Gitblit v1.9.1