Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc

Helius

2021-05-26 65247a73bbeced41f2e4fd1ac3def2170ee98fe9

 src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java

@@ -97,7 +97,7 @@
    }

    public String getOpeningFeeAmount() {
        return openingFeeAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
        return openingFeeAmount == null ? "" : openingFeeAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
    }

    public String getForceClosingPrice() {
@@ -105,14 +105,14 @@
    }

    public String getClosingFeeAmount() {
        return closingFeeAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
        return closingFeeAmount == null ? "" : closingFeeAmount.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 getRewardAmount() {
        return rewardAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
        return rewardAmount == null ? "" : rewardAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
    }
}