Helius
2020-08-25 adb99db2cb5359416713a1bd3a13423ddf0f0d80
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
@@ -261,7 +261,7 @@
        MemberEntity memberEntity = memberDao.selectById(holdOrderEntity.getMemberId());
        MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(holdOrderEntity.getMemberId(), CoinTypeEnum.USDT.name());
        MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(holdOrderEntity.getMemberId(), CoinTypeConvert.convertContractTypeToCoin(symbol));
        if (walletContract != null) {
            BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(symbol);
            // 盈亏
@@ -303,8 +303,13 @@
            BigDecimal bondAmount = CalculateUtil.getBondAmount(holdOrderEntity.getOpeningPrice(), lotNumber, closeCnt, holdOrderEntity.getLeverRatio());
            log.info("bondAmount:{}", bondAmount);
            // 平仓手续费
            BigDecimal fee = holdOrderEntity.getOpeningFeeAmount().divide(BigDecimal.valueOf(holdOrderEntity.getSymbolCnt()), 8, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(closeCnt));
            // 平仓手续费  TODO 可能需要修复手续费
            BigDecimal fee = BigDecimal.ZERO;
            if (holdOrderEntity.getSymbolCnt() != 0) {
                fee = holdOrderEntity.getOpeningFeeAmount().divide(BigDecimal.valueOf(holdOrderEntity.getSymbolCnt()), 8, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(closeCnt));
            } else {
                fee = holdOrderEntity.getOpeningFeeAmount();
            }
            log.info("fee:{}", fee);
            ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(holdOrderEntity);
            contractOrderEntity.setId(null);
@@ -318,12 +323,14 @@
            contractOrderDao.insert(contractOrderEntity);
            if (holdOrderEntity.getSymbolCntSale() != 0) {
                holdOrderEntity.setOpeningFeeAmount(holdOrderEntity.getOpeningFeeAmount().subtract(fee));
                holdOrderEntity.setBondAmount(holdOrderEntity.getBondAmount().subtract(bondAmount));
                contractHoldOrderDao.updateById(holdOrderEntity);
            } else {
                contractHoldOrderDao.deleteById(holdOrderEntity.getId());
            }
            BigDecimal changeAmount = profitOrLoss.add(bondAmount).subtract(fee);
            BigDecimal changeAmount = profitOrLoss.add(bondAmount);
            memberWalletContractDao.increaseWalletContractBalanceById(changeAmount, profitOrLoss.subtract(fee), null, walletContract.getId());