From 9e6054ca0612a05ec2b698b8a63db7605c600725 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 05 Mar 2021 14:51:08 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java | 21 +++++++++++++++++++--
1 files changed, 19 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 9171e94..235ab79 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
@@ -1,5 +1,6 @@
package com.xcong.excoin.modules.contract.parameter.vo;
+import cn.hutool.core.util.StrUtil;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -19,6 +20,12 @@
@ApiModelProperty("订单ID")
private Long id;
+
+ @ApiModelProperty("仓位类型 1-逐仓 2-全仓")
+ private int positionType;
+
+ @ApiModelProperty("杠杆倍率")
+ private int leverRatio;
@ApiModelProperty("订单类型 1开多,2开空,3平多,4平空")
private int orderType;
@@ -29,7 +36,7 @@
@ApiModelProperty("开仓均价")
private BigDecimal openingPrice;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("开仓价")
private Date openingTime;
@@ -42,6 +49,9 @@
@ApiModelProperty("张数")
private int symbolCnt;
+ @ApiModelProperty("可平张数")
+ private int symbolCntSale;
+
@ApiModelProperty("已实现盈亏")
private BigDecimal rewardAmount;
@@ -51,7 +61,7 @@
@ApiModelProperty("平仓手续费")
private BigDecimal closingFeeAmount;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("平仓时间")
private Date closingTime;
@@ -67,6 +77,13 @@
@ApiModelProperty(value = "合约类型 1-普通 2-跟单")
private Integer contractType;
+ @ApiModelProperty(value = "订单编号")
+ private String orderNo;
+
+ public String getOrderNo() {
+ return StrUtil.isNotBlank(orderNo) ? orderNo.substring(orderNo.length() - 6) : "";
+ }
+
public String getOpeningFeeAmount() {
return openingFeeAmount == null ? "" : openingFeeAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
}
--
Gitblit v1.9.1