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

Helius

2021-03-26 19a0ffbf9653be38d3f366fc25cda8357e534086

 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;
@@ -72,20 +73,47 @@
    @ApiModelProperty(value = "仓位类型 1-逐仓 2-全仓")
    private Integer positionType;

    @ApiModelProperty(value = "维持保证金")
    private BigDecimal holdBond;

    @ApiModelProperty(value = "手续费")
    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() {
        return profitOrLoss.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
        return profitOrLoss.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
    }

    public BigDecimal getCanAddMaxBond() {