modify

Helius

2020-08-28 385eb4e47f9e2d89131f276129c1f8e6988edf23

 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();
            }
@@ -326,6 +327,14 @@
                contractHoldOrderDao.updateById(holdOrderEntity);
            } else {
                contractHoldOrderDao.deleteById(holdOrderEntity.getId());

                // 若平掉所有张数，若存在委托平仓，则删除委托平仓记录
                List<ContractEntrustOrderEntity> entrustOrders = contractEntrustOrderDao.selectEntrustOrderByOrderNo(holdOrderEntity.getOrderNo());
                if (CollUtil.isNotEmpty(entrustOrders)) {
                    for (ContractEntrustOrderEntity entrustOrder : entrustOrders) {
                        contractEntrustOrderDao.deleteById(entrustOrder.getId());
                    }
                }
            }

            BigDecimal changeAmount = profitOrLoss.add(bondAmount);
@@ -426,7 +435,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);