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

KKSU

2024-09-30 36be00e0f3cbe0d559c646fd2977e6e3a74aa6f9

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

@@ -22,6 +22,9 @@
    @ApiModelProperty("订单类型 -1撤单,1开多,2开空,3平多,4平空")
    private int orderType;

    @ApiModelProperty("仓位类型 1-逐仓 2-全仓")
    private int positionType;

    @ApiModelProperty("订单编号")
    private String orderNo;

@@ -82,31 +85,31 @@
    private int leverRatio;

    public String getClosingPrice() {
        return closingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
        return closingPrice == null ? "" : closingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
    }

    public String getClosingFeeAmount() {
        return closingFeeAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
        return closingFeeAmount == null ? "" : closingFeeAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
    }

    public String getRewardAmount() {
        return rewardAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
        return rewardAmount == null ? "" : rewardAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
    }

    public String getOpeningPrice() {
        return openingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
        return openingPrice == null ? "" : openingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
    }

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

    public String getBondAmount() {
        return bondAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
        return bondAmount == null ? "" : bondAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
    }

    public String getHoldAmount() {
        return holdAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
        return holdAmount == null ? "" : holdAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
    }

    public void setClosingFeeAmount(BigDecimal closingFeeAmount, BigDecimal feeSpread) {