From b787caa660c2aed5281d1429d5db2ec18ac8fa7c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 25 May 2021 16:31:36 +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/HoldOrderListVo.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 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 e9b3d26..9bd38ed 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
@@ -84,8 +84,16 @@
         return CommonUtils.amountDotFormat(this.symbol, openingPrice);
     }
 
+    public String getStopLossPrice() {
+        return CommonUtils.amountDotFormat(this.symbol, stopLossPrice);
+    }
+
+    public String getStopProfitPrice() {
+        return CommonUtils.amountDotFormat(this.symbol, stopProfitPrice);
+    }
+
     public String getBondAmount() {
-        return bondAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
+        return bondAmount == null ? "" : bondAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
     }
 
     public String getForceClosingPrice() {

--
Gitblit v1.9.1