From 03ae1e434c4f838d1f4290a945a5898a43b7a1c8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 14 Apr 2021 18:48:14 +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/OrderDetailVo.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java
index 143fdf6..fde98fd 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java
@@ -90,11 +90,11 @@
}
public String getClosingFeeAmount() {
- return closingFeeAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
+ return closingFeeAmount == null ? "" : closingFeeAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getRewardAmount() {
- return rewardAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
+ return rewardAmount == null ? "" : rewardAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getOpeningPrice() {
@@ -102,15 +102,15 @@
}
public String getOpeningFeeAmount() {
- return openingFeeAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
+ return openingFeeAmount == null ? "" : openingFeeAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getBondAmount() {
- return bondAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
+ return bondAmount == null ? "" : bondAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getHoldAmount() {
- return holdAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
+ return holdAmount == null ? "" : holdAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getStopLossPrice() {
--
Gitblit v1.9.1