Merge remote-tracking branch 'origin/whole' into whole

zainali5120

2020-10-25 bef3b23ca8918a355f6ff9751b46f4c35970f19e

 src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java

@@ -300,6 +300,8 @@
            // 保证金
            BigDecimal bondAmount = CalculateUtil.getBondAmount(holdOrderEntity.getOpeningPrice(), lotNumber, closeCnt, holdOrderEntity.getLeverRatio());

            BigDecimal rewardRatio = profitOrLoss.divide(bondAmount, 8, BigDecimal.ROUND_DOWN);

            log.info("bondAmount:{}", bondAmount);
            // 平仓手续费  TODO 可能需要修复手续费
            BigDecimal fee = BigDecimal.ZERO;
@@ -320,6 +322,7 @@
            contractOrderEntity.setRewardAmount(profitOrLoss);
            contractOrderEntity.setBondAmount(bondAmount);
            contractOrderEntity.setClosingFeeAmount(fee);
            contractOrderEntity.setRewardRatio(rewardRatio);
            contractOrderDao.insert(contractOrderEntity);

            if (holdOrderEntity.getSymbolCntSale() != 0) {