modify

Helius

2020-08-27 630edfbacc83aa775705d5fd704eb4bfca0a848f

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

@@ -302,7 +302,8 @@
            log.info("bondAmount:{}", bondAmount);
            // 平仓手续费  TODO 可能需要修复手续费
            BigDecimal fee = BigDecimal.ZERO;
            if (holdOrderEntity.getSymbolCnt() != 0) {

            if (holdOrderEntity.getSymbolCntSale() != 0) {
                fee = holdOrderEntity.getOpeningFeeAmount().divide(BigDecimal.valueOf(holdOrderEntity.getSymbolCnt()), 8, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(closeCnt));
            } else {
                fee = holdOrderEntity.getOpeningFeeAmount();
@@ -328,8 +329,12 @@
            }

            BigDecimal changeAmount = profitOrLoss.add(bondAmount);
            log.info("changeAmount : {}", changeAmount);

            memberWalletContractDao.increaseWalletContractBalanceById(changeAmount, profitOrLoss.subtract(fee), null, walletContract.getId());
            BigDecimal total = profitOrLoss.subtract(fee);
            log.info("totalMoney : {}", total);

            memberWalletContractDao.increaseWalletContractBalanceById(changeAmount, total, null, walletContract.getId());

            ThreadPoolUtils.sendWholeForceClosingPrice(holdOrderEntity.getSymbol(), memberEntity);
            // 计算佣金
@@ -343,6 +348,7 @@
        if (CollUtil.isNotEmpty(list)) {
            List<Long> ids = new ArrayList<>();
            list.forEach(model -> ids.add(model.getOrderId()));
            log.info("---平仓-->{}",ids);
            List<ContractEntrustOrderEntity> contractEntrustOrderEntities = contractEntrustOrderDao.selectEntrustOrderListByIds(ids);

            if (CollUtil.isNotEmpty(contractEntrustOrderEntities)) {