From ded93a205fc7176b98c24c6e56ad76e9db998b02 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 10 Jul 2020 11:40:11 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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 6ae45fe..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
@@ -19,8 +19,11 @@
@ApiModelProperty("订单ID")
private Long id;
- @ApiModelProperty("订单类型 -1撤单,1开多,2开空,3平多,4平空")
+ @ApiModelProperty("订单类型 1开多,2开空,3平多,4平空")
private int orderType;
+
+ @ApiModelProperty("订单状态 1成交 2撤单")
+ private int orderStatus;
@ApiModelProperty("开仓均价")
private BigDecimal openingPrice;
@@ -39,7 +42,7 @@
private int symbolCnt;
@ApiModelProperty("已实现盈亏")
- private BigDecimal rewardRatio;
+ private BigDecimal rewardAmount;
@ApiModelProperty("平仓类型 2平多3平空4爆仓平多5爆仓平空6止盈平多7止盈平空8止损平多9止损平空")
private int closingType;
@@ -51,7 +54,22 @@
@ApiModelProperty("平仓时间")
private Date closingTime;
+ @ApiModelProperty("平仓价格")
+ private BigDecimal closingPrice;
+
@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