From 6bebf72db1ec82ce983575d51e0ac2aedcea90c6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 26 May 2021 15:15:24 +0800
Subject: [PATCH] Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc

---
 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