From facab577702e7c34182ce8fb13faf03f74363d93 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 25 Mar 2021 12:17:37 +0800
Subject: [PATCH] Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity
---
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 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 235ab79..e843f50 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
@@ -2,6 +2,7 @@
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;
@@ -80,24 +81,38 @@
@ApiModelProperty(value = "订单编号")
private String orderNo;
+ @ApiModelProperty(value = "币种")
+ private String symbol;
+
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 getOpeningPrice() {
+ return CommonUtils.amountDotFormat(this.symbol, openingPrice);
}
+ public String getClosingPrice() {
+ return CommonUtils.amountDotFormat(this.symbol, closingPrice);
+ }
+
+ public String getOpeningFeeAmount() {
+ return CommonUtils.amountDotFormat(this.symbol, openingFeeAmount);
+ }
+
+ public String getForceClosingPrice() {
+ return CommonUtils.amountDotFormat(this.symbol, forceClosingPrice);
+ }
public String getClosingFeeAmount() {
- return closingFeeAmount == null ? "" : closingFeeAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return CommonUtils.amountDotFormat(this.symbol, closingFeeAmount);
}
public String getBondAmount() {
- return bondAmount == null ? "" : bondAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return CommonUtils.amountDotFormat(this.symbol, bondAmount);
}
public String getRewardAmount() {
- return rewardAmount == null ? "" : rewardAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return CommonUtils.amountDotFormat(this.symbol, rewardAmount);
}
}
--
Gitblit v1.9.1