Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin

Helius

2020-06-07 8ec85f3d39662b276a049c9d9f27b6b3738c580f

Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin

 src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java

@@ -183,9 +183,9 @@
         */

        //获取当前的合约持仓

        //获取实时盈亏

        BigDecimal profitAndLoss = new BigDecimal("50.000");

        BigDecimal profitAndLoss = new BigDecimal("0");

        //获取总付款

        BigDecimal totalPayment = new BigDecimal("50.000");

        BigDecimal totalPayment = new BigDecimal("0");

        BigDecimal lastTotalBalance = new BigDecimal("0");

        BigDecimal totalBalance = walletContract.getTotalBalance();

        lastTotalBalance = totalBalance.add(profitAndLoss);


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

@@ -42,7 +42,7 @@
    private int symbolCnt;

    @ApiModelProperty("已实现盈亏")
    private BigDecimal rewardRatio;
    private BigDecimal rewardAmount;

    @ApiModelProperty("平仓类型 2平多3平空4爆仓平多5爆仓平空6止盈平多7止盈平空8止损平多9止损平空")
    private int closingType;