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/OrderListVo.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 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..48cc3ba 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;
@@ -19,8 +20,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;
@@ -38,8 +42,11 @@
@ApiModelProperty("张数")
private int symbolCnt;
+ @ApiModelProperty("可平张数")
+ private int symbolCntSale;
+
@ApiModelProperty("已实现盈亏")
- private BigDecimal rewardRatio;
+ private BigDecimal rewardAmount;
@ApiModelProperty("平仓类型 2平多3平空4爆仓平多5爆仓平空6止盈平多7止盈平空8止损平多9止损平空")
private int closingType;
@@ -51,7 +58,32 @@
@ApiModelProperty("平仓时间")
private Date closingTime;
+ @ApiModelProperty("平仓价格")
+ private BigDecimal closingPrice;
+
@ApiModelProperty("强平价")
private BigDecimal forceClosingPrice;
+ @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();
+ }
+
+
+ public String getClosingFeeAmount() {
+ return closingFeeAmount == null ? "" : closingFeeAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ }
+
+ 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