From ffca7fc095a9111837dfd82288faef450b749f69 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Wed, 28 Apr 2021 18:44:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/activity' into activity
---
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderDetailVo.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderDetailVo.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderDetailVo.java
index f100a5c..93eb7ee 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderDetailVo.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderDetailVo.java
@@ -75,15 +75,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 getForceClosingPrice() {
--
Gitblit v1.9.1