From 36be00e0f3cbe0d559c646fd2977e6e3a74aa6f9 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 30 Sep 2024 16:57:22 +0800
Subject: [PATCH] Merge branch 'bea' of http://120.27.238.55:7000/r/exchange into bea
---
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 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 573d040..8977562 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;
@@ -16,8 +17,17 @@
@ApiModel(value = "OrderListVo", description = "历史委托订单接口返回参数类")
public class OrderListVo {
- @ApiModelProperty("订单类型 -1撤单,1开多,2开空,3平多,4平空")
+ @ApiModelProperty("订单ID")
+ private Long id;
+
+ @ApiModelProperty("订单类型 1开多,2开空,3平多,4平空")
private int orderType;
+
+ @ApiModelProperty("仓位类型 1-逐仓 2-全仓")
+ private int positionType;
+
+ @ApiModelProperty("订单状态 1成交 2撤单")
+ private int orderStatus;
@ApiModelProperty("开仓均价")
private BigDecimal openingPrice;
@@ -36,7 +46,7 @@
private int symbolCnt;
@ApiModelProperty("已实现盈亏")
- private BigDecimal rewardRatio;
+ private BigDecimal rewardAmount;
@ApiModelProperty("平仓类型 2平多3平空4爆仓平多5爆仓平空6止盈平多7止盈平空8止损平多9止损平空")
private int closingType;
@@ -48,7 +58,39 @@
@ApiModelProperty("平仓时间")
private Date closingTime;
+ @ApiModelProperty("平仓价格")
+ private BigDecimal closingPrice;
+
@ApiModelProperty("强平价")
private BigDecimal forceClosingPrice;
+ @ApiModelProperty(value = "交易类型 1-市价 2-限价")
+ private Integer tradeType;
+
+ @ApiModelProperty(value = "杠杆倍率")
+ private Integer leverRatio;
+
+ @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();
+ }
+
+
+ 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