modify

Helius

2020-08-27 814b84bc20bf14c806452e91ac6154d2ff363a2b

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

@@ -304,7 +304,8 @@
            BigDecimal fee = BigDecimal.ZERO;

            if (holdOrderEntity.getSymbolCntSale() != 0) {
                fee = holdOrderEntity.getOpeningFeeAmount().divide(BigDecimal.valueOf(holdOrderEntity.getSymbolCnt()), 8, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(closeCnt));
                BigDecimal totalFeeAmount = contractOrderDao.selectWholeFeeAmountByOrderNo(holdOrderEntity.getOrderNo());
                fee = totalFeeAmount.divide(BigDecimal.valueOf(holdOrderEntity.getSymbolCnt()), 8, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(closeCnt));
            } else {
                fee = holdOrderEntity.getOpeningFeeAmount();
            }
@@ -415,6 +416,8 @@
        log.info("fee:{}", fee);
        ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(holdOrderEntity);
        contractOrderEntity.setId(null);
        contractOrderEntity.setEntrustOpeningPrice(newPrice);
        contractOrderEntity.setEntrustTime(new Date());
        contractOrderEntity.setClosingPrice(newPrice);
        contractOrderEntity.setOrderType(orderType);
        contractOrderEntity.setClosingType(closingType);
@@ -424,7 +427,8 @@
        contractOrderEntity.setClosingFeeAmount(fee);
        contractOrderDao.insert(contractOrderEntity);

        if (holdOrderEntity.getSymbolCntSale() != 0) {
        if (holdOrderEntity.getSymbolCntSale() - closeCnt != 0) {
            holdOrderEntity.setSymbolCntSale(holdOrderEntity.getSymbolCntSale() - closeCnt);
            holdOrderEntity.setOpeningFeeAmount(holdOrderEntity.getOpeningFeeAmount().subtract(fee));
            holdOrderEntity.setBondAmount(holdOrderEntity.getBondAmount().subtract(bondAmount));
            contractHoldOrderDao.updateById(holdOrderEntity);
@@ -440,6 +444,7 @@

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

        contractEntrustOrderDao.deleteById(entrustOrder.getId());
        ThreadPoolUtils.sendWholeForceClosingPrice(holdOrderEntity.getSymbol(), memberEntity);
        // 计算佣金
        ThreadPoolUtils.calReturnMoney(memberEntity.getId(), fee, contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);