From 6cae1ca8809f6dfe4f333c7817eaf611bfe7337d Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 02 Sep 2020 18:44:25 +0800 Subject: [PATCH] modify --- src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java index 4e3c023..9a6b047 100644 --- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java +++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java @@ -99,7 +99,7 @@ int subCnt = 0; BigDecimal openPrice = BigDecimal.ZERO; int type = 1; - BigDecimal feeAmount = BigDecimal.ZERO; + BigDecimal bondAmount = BigDecimal.ZERO; BigDecimal sku = BigDecimal.ZERO; Long id = 0L; @@ -118,12 +118,13 @@ subCnt = maxCnt - holdOrderEntity.getSymbolCntSale(); } - feeAmount = feeAmount.add(holdOrderEntity.getOpeningFeeAmount()); + bondAmount = bondAmount.add(holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningFeeAmount())); sku = holdOrderEntity.getSymbolSku(); } BigDecimal forceSetPrice = BigDecimal.ZERO; if (subCnt != 0) { - forceSetPrice = getForceSetPrice(walletContract.getTotalBalance().subtract(feeAmount), openPrice, subCnt, sku, type, memberEntity); + log.info("---->{}, {}", walletContract.getAvailableBalance(), bondAmount); + forceSetPrice = getForceSetPrice(walletContract.getAvailableBalance().add(bondAmount), openPrice, subCnt, sku, type, memberEntity); } log.info("强平价:{}", forceSetPrice); -- Gitblit v1.9.1