From 87c7037e167ba94e858c4ae7a1d1870c4128b775 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 06 Apr 2021 16:12:33 +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 39dab12..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 CommonUtils.amountDotFormat(this.symbol, closingFeeAmount);
+        return closingFeeAmount == null ? "" : closingFeeAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
     }
 
     public String getRewardAmount() {
-        return CommonUtils.amountDotFormat(this.symbol, rewardAmount);
+        return rewardAmount == null ? "" : rewardAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
     }
 
     public String getOpeningPrice() {
@@ -102,15 +102,15 @@
     }
 
     public String getOpeningFeeAmount() {
-        return CommonUtils.amountDotFormat(this.symbol, openingFeeAmount);
+        return openingFeeAmount == null ? "" : openingFeeAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
     }
 
     public String getBondAmount() {
-        return CommonUtils.amountDotFormat(this.symbol, bondAmount);
+        return bondAmount == null ? "" : bondAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
     }
 
     public String getHoldAmount() {
-        return CommonUtils.amountDotFormat(this.symbol, holdAmount);
+        return holdAmount == null ? "" : holdAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
     }
 
     public String getStopLossPrice() {

--
Gitblit v1.9.1