From ed69a1c44fa9bce098d412985e8f17163d7def8c Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 26 Aug 2020 19:05:14 +0800 Subject: [PATCH] modify --- src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java index fb83361..7aa9e38 100644 --- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java +++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java @@ -159,7 +159,7 @@ log.info("手续费相加:{}", fee); BigDecimal prePaymentAmount = bondAmount.add(fee).add(fee); - BigDecimal subBondAmount = bondAmount.subtract(wholeHoldOrder.getBondAmount()); + BigDecimal subBondAmount = bondAmount.subtract(wholeHoldOrder.getBondAmount()).subtract(wholeHoldOrder.getOpeningFeeAmount()); log.info("保证金差值:{}", subBondAmount); if (subBondAmount.compareTo(walletContract.getAvailableBalance()) > -1) { @@ -172,7 +172,7 @@ // log.info("新预估强平价:{}", forceClosingPrice); ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(wholeHoldOrder); - contractOrderEntity.setBondAmount(bondAmount.add(openFeePrice)); + contractOrderEntity.setBondAmount(subBondAmount.add(openFeePrice)); // contractOrderEntity.setForceClosingPrice(forceClosingPrice); contractOrderEntity.setOpeningPrice(newOpenPrice); contractOrderEntity.setSymbolCnt(submitOrderDto.getSymbolCnt()); @@ -183,7 +183,7 @@ wholeHoldOrder.setOpeningFeeAmount(fee); wholeHoldOrder.setOpeningPrice(newOpenPrice); - wholeHoldOrder.setBondAmount(bondAmount); + wholeHoldOrder.setBondAmount(bondAmount.add(fee)); wholeHoldOrder.setSymbolCnt(wholeHoldOrder.getSymbolCnt() + submitOrderDto.getSymbolCnt()); wholeHoldOrder.setSymbolCntSale(wholeHoldOrder.getSymbolCntSale() + submitOrderDto.getSymbolCnt()); // wholeHoldOrder.setForceClosingPrice(forceClosingPrice); -- Gitblit v1.9.1