20210325 跟随者的历史订单显示爆仓，爆仓算入跟随者收益

xiaoyong931011

2021-03-25 36ebe651620a89fd158038defc344a01fa3a3e70

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

@@ -302,6 +302,7 @@
            }
            log.info("profitOrLoss:{}", profitOrLoss);

            BigDecimal rewardRatio = profitOrLoss.divide(holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningFeeAmount()), 4, BigDecimal.ROUND_DOWN);
            // 保证金
            BigDecimal bondAmount = CalculateUtil.getBondAmount(holdOrderEntity.getOpeningPrice(), lotNumber, closeCnt, holdOrderEntity.getLeverRatio());

@@ -323,6 +324,7 @@
            contractOrderEntity.setClosingType(closingType);
            contractOrderEntity.setSymbolCnt(closeCnt);
            contractOrderEntity.setRewardAmount(profitOrLoss);
            contractOrderEntity.setRewardRatio(rewardRatio);
            contractOrderEntity.setBondAmount(bondAmount.add(fee));
            contractOrderEntity.setClosingFeeAmount(fee);
            contractOrderEntity.setClosingTime(new Date());
@@ -384,8 +386,7 @@
        log.info("执行平仓委托");

        Long memberId = entrustOrder.getMemberId();
//        int orderType = entrustOrder.getEntrustType() == ContractEntrustOrderEntity.ENTRUST_TYPE_CLOSE_MORE ? ContractHoldOrderEntity.OPENING_TYPE_MORE : ContractHoldOrderEntity.OPENING_TYPE_LESS;
        int orderType = entrustOrder.getEntrustType();
        int orderType = entrustOrder.getEntrustType() == ContractEntrustOrderEntity.ENTRUST_TYPE_CLOSE_MORE ? ContractHoldOrderEntity.OPENING_TYPE_MORE : ContractHoldOrderEntity.OPENING_TYPE_LESS;
        String symbol = entrustOrder.getSymbol();

        MemberEntity memberEntity = memberDao.selectById(memberId);
@@ -446,11 +447,13 @@
        contractOrderEntity.setEntrustOpeningPrice(newPrice);
        contractOrderEntity.setEntrustTime(new Date());
        contractOrderEntity.setClosingPrice(newPrice);
        contractOrderEntity.setOrderType(orderType);
        contractOrderEntity.setTradeType(ContractOrderEntity.TRADE_TYPE_LIMIT_PRICE);
        contractOrderEntity.setOrderType(entrustOrder.getEntrustType());
        contractOrderEntity.setClosingType(closingType);
        contractOrderEntity.setSymbolCnt(closeCnt);
        contractOrderEntity.setRewardAmount(profitOrLoss);
        contractOrderEntity.setBondAmount(bondAmount);
        contractOrderEntity.setClosingTime(new Date());
        contractOrderEntity.setClosingFeeAmount(fee);
        contractOrderDao.insert(contractOrderEntity);