From 19a0ffbf9653be38d3f366fc25cda8357e534086 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 26 Mar 2021 10:03:37 +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/HoldOrderListVo.java |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 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 cbacae4..e0adbad 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
@@ -1,6 +1,7 @@
 package com.xcong.excoin.modules.contract.parameter.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xcong.excoin.utils.CommonUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -79,15 +80,36 @@
     private BigDecimal openingFeeAmount;
 
     public String getOpeningPrice() {
-        return openingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+
+        return CommonUtils.amountDotFormat(this.symbol, openingPrice);
+    }
+
+    private String dotFormat(BigDecimal price) {
+        String priceFormat = "";
+        switch (this.symbol) {
+            case "BTC/USDT":
+            case "ETH/USDT":
+            case "LTC/USDT":
+            case "BCH/USDT":
+                priceFormat = price.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
+                break;
+            case "EOS/USDT":
+            case "XRP/USDT":
+            case "ETC/USDT":
+                priceFormat = price.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+                break;
+            default:
+                priceFormat = price.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
+        }
+        return priceFormat;
     }
 
     public String getBondAmount() {
-        return bondAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+        return CommonUtils.amountDotFormat(this.symbol, bondAmount);
     }
 
     public String getForceClosingPrice() {
-        return forceClosingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+        return CommonUtils.amountDotFormat(this.symbol, forceClosingPrice);
     }
 
     public String getProfitOrLoss() {

--
Gitblit v1.9.1