20200806 代码提交

xiaoyong931011

2020-08-06 568d033e0cca67b0ceb8d4106850c97dbd36f373

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

@@ -81,17 +81,22 @@
    @Override
    public void cancelHoldOrder(List<Long> ids) {
        if (CollUtil.isNotEmpty(ids)) {
            if (ids.size() == 1) {
                ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectById(ids.get(0));
                cancelHoldOrderMethod(holdOrderEntity);
            } else {
                List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectBatchIds(ids);
                if (CollUtil.isNotEmpty(holdOrderEntities)) {
                    for (ContractHoldOrderEntity holdOrder : holdOrderEntities) {
                        cancelHoldOrderMethod(holdOrder);
            try {
                if (ids.size() == 1) {
                    ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectById(ids.get(0));
                    cancelHoldOrderMethod(holdOrderEntity);
                } else {
                    List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectBatchIds(ids);
                    if (CollUtil.isNotEmpty(holdOrderEntities)) {
                        for (ContractHoldOrderEntity holdOrder : holdOrderEntities) {
                            cancelHoldOrderMethod(holdOrder);
                        }
                    }
                }
            }catch (Exception e) {
                log.error("平仓异常", e);
            }

        }
    }

@@ -138,6 +143,9 @@
                }
            }

            // 盈亏比例(回报率)
            BigDecimal rewardRatio = profitOrLoss.divide(holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningFeeAmount()), 8, BigDecimal.ROUND_DOWN);

            FollowTraderInfoEntity traderInfoEntity = null;
            // 判断当前订单是否为跟单
            if (ContractOrderEntity.CONTRACTTYPE_DOCUMENTARY == holdOrderEntity.getContractType()) {
@@ -146,7 +154,7 @@
                    traderInfoEntity = followTraderInfoDao.selectTraderInfoByOrderId(holdOrderEntity.getId());
                    if (profitOrLoss.compareTo(BigDecimal.ZERO) > 0) {
                        // 计算需返利给交易员的金额
                        BigDecimal returnMoney = profitOrLoss.subtract(traderInfoEntity.getProfitRatio());
                        BigDecimal returnMoney = profitOrLoss.multiply(traderInfoEntity.getProfitRatio());
                        profitOrLoss = profitOrLoss.subtract(returnMoney);
                        MemberWalletContractEntity traderWallet = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(traderInfoEntity.getMemberId(), CoinTypeEnum.USDT.name());
                        memberWalletContractDao.increaseWalletContractBalanceById(returnMoney, returnMoney, null, traderWallet.getId());
@@ -154,9 +162,6 @@
                    }
                }
            }

            // 盈亏比例(回报率)
            BigDecimal rewardRatio = profitOrLoss.divide(holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningFeeAmount()), 8, BigDecimal.ROUND_DOWN);

            ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(holdOrderEntity);
            contractOrderEntity.setId(null);