From 829f629756e5402bcd3e9f6ef1f9c6dbffbabb11 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 17 Apr 2024 14:46:29 +0800
Subject: [PATCH] 55测试环境
---
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 7 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 221d480..82a3703 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,9 +1,12 @@
package com.xcong.excoin.modules.contract.parameter.vo;
+import cn.hutool.core.util.StrUtil;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xcong.excoin.utils.CommonUtils;
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;
@@ -18,6 +21,12 @@
@ApiModelProperty("订单ID")
private Long id;
+
+ @ApiModelProperty("仓位类型 1-逐仓 2-全仓")
+ private int positionType;
+
+ @ApiModelProperty("杠杆倍率")
+ private int leverRatio;
@ApiModelProperty("订单类型 1开多,2开空,3平多,4平空")
private int orderType;
@@ -28,7 +37,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;
@@ -41,6 +50,9 @@
@ApiModelProperty("张数")
private int symbolCnt;
+ @ApiModelProperty("可平张数")
+ private int symbolCntSale;
+
@ApiModelProperty("已实现盈亏")
private BigDecimal rewardAmount;
@@ -50,7 +62,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;
@@ -63,13 +75,44 @@
@ApiModelProperty(value = "交易类型 1-市价 2-限价")
private Integer tradeType;
- public BigDecimal getOpeningFeeAmount() {
- return openingFeeAmount == null ? openingFeeAmount : openingFeeAmount.setScale(8, BigDecimal.ROUND_DOWN);
+ @ApiModelProperty(value = "合约类型 1-普通 2-跟单")
+ private Integer contractType;
+
+ @ApiModelProperty(value = "订单编号")
+ private String orderNo;
+
+ @ApiModelProperty(value = "币种")
+ private String symbol;
+
+ public String getOrderNo() {
+ return StrUtil.isNotBlank(orderNo) ? orderNo.substring(orderNo.length() - 6) : "";
}
-
- public BigDecimal getClosingFeeAmount() {
- return closingFeeAmount == null ? closingFeeAmount : closingFeeAmount.setScale(8, BigDecimal.ROUND_DOWN);
+ public String getOpeningPrice() {
+ return CommonUtils.amountDotFormat(this.symbol, openingPrice);
}
+ public String getClosingPrice() {
+ return CommonUtils.amountDotFormat(this.symbol, closingPrice);
+ }
+
+ public String getOpeningFeeAmount() {
+ return openingFeeAmount == null ? "" : openingFeeAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
+ }
+
+ public String getForceClosingPrice() {
+ return CommonUtils.amountDotFormat(this.symbol, forceClosingPrice);
+ }
+
+ public String getClosingFeeAmount() {
+ return closingFeeAmount == null ? "" : closingFeeAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
+ }
+
+ public String getBondAmount() {
+ return bondAmount == null ? "" : bondAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
+ }
+
+ public String getRewardAmount() {
+ return rewardAmount == null ? "" : rewardAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
+ }
}
--
Gitblit v1.9.1