From f01dccf14c3600395b075303a92e11b1e5a9df38 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 10 Jul 2020 11:27:26 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java | 2 +-
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java | 16 ++++++++++------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java
index ee0a6c3..e06bff3 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java
@@ -66,16 +66,20 @@
@ApiModelProperty(value = "交易类型 1-市价 2-限价")
private Integer tradeType;
- public BigDecimal getOpeningPrice() {
- return openingPrice.setScale(4, BigDecimal.ROUND_DOWN);
+ public String getOpeningPrice() {
+ return openingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
}
- public BigDecimal getBondAmount() {
- return bondAmount.setScale(4, BigDecimal.ROUND_DOWN);
+ public String getBondAmount() {
+ return bondAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
}
- public BigDecimal getForceClosingPrice() {
- return forceClosingPrice.setScale(4, BigDecimal.ROUND_DOWN);
+ public String getForceClosingPrice() {
+ return forceClosingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ }
+
+ public String getProfitOrLoss() {
+ return profitOrLoss.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
}
public BigDecimal getCanAddMaxBond() {
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
index 49f0b56..b9267f3 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
@@ -266,7 +266,7 @@
Map<String, Object> result = new HashMap<>();
result.put("hold", resultList);
- result.put("totalProfitOrLoss", totalProfitOrLoss);
+ result.put("totalProfitOrLoss", totalProfitOrLoss.setScale(4, BigDecimal.ROUND_DOWN).toPlainString());
return Result.ok(result);
}
return Result.ok("success");
--
Gitblit v1.9.1