From d8b9adf6a39ad94f22f473d11bc829a1cea5865f Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 26 Aug 2020 19:43:12 +0800 Subject: [PATCH] modify --- src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java index 706dda4..22ee611 100644 --- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java +++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java @@ -302,6 +302,7 @@ log.info("bondAmount:{}", bondAmount); // 平仓手续费 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 { @@ -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); // 计算佣金 -- Gitblit v1.9.1