From 013641a0b4d052fdb0ea69a891df502498943a0b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 28 Aug 2020 17:29:26 +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 3e8c5a1..51af5ac 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -103,10 +103,11 @@
             int totalCnt = 0;
 
             for (ContractHoldOrderEntity holdOrderEntity : holdOrderEntities) {
-                BigDecimal forceSetPrice = getForceSetPrice(walletContract.getAvailableBalance().subtract(holdOrderEntity.getOpeningFeeAmount()), holdOrderEntity.getOpeningPrice(), holdOrderEntity.getSymbolCntSale(), holdOrderEntity.getSymbolSku(), holdOrderEntity.getOpeningType(), memberEntity);
-                log.info("订单强平价 : {}, 订单ID : {}", forceSetPrice, holdOrderEntity.getId());
+                BigDecimal forceSetPrice = getForceSetPrice(walletContract.getTotalBalance().subtract(holdOrderEntity.getOpeningFeeAmount()), holdOrderEntity.getOpeningPrice(), holdOrderEntity.getSymbolCntSale(), holdOrderEntity.getSymbolSku(), holdOrderEntity.getOpeningType(), memberEntity);
+                log.info("订单强平价 : {}, 订单ID : {}, {}", forceSetPrice, holdOrderEntity.getId(), holdOrderEntity.getSymbolCntSale());
                 totalSetPrice = totalSetPrice.add(forceSetPrice.multiply(BigDecimal.valueOf(holdOrderEntity.getSymbolCntSale())));
                 totalCnt += holdOrderEntity.getSymbolCntSale();
+                log.info("-->{}", totalCnt);
             }
 
             BigDecimal forceSetPrice = totalSetPrice.divide(BigDecimal.valueOf(totalCnt), 8, BigDecimal.ROUND_DOWN);
@@ -117,7 +118,7 @@
                 holdOrderDao.updateById(updateHoldOrder);
 
                 if (forceSetPrice.compareTo(BigDecimal.ZERO) >= 0) {
-                    sendOrderBombMsg(updateHoldOrder.getId(), updateHoldOrder.getOpeningType(), forceSetPrice, updateHoldOrder.getSymbol(), updateHoldOrder.getOperateNo());
+//                    sendOrderBombMsg(updateHoldOrder.getId(), updateHoldOrder.getOpeningType(), forceSetPrice, updateHoldOrder.getSymbol(), updateHoldOrder.getOperateNo());
                 }
             }
 

--
Gitblit v1.9.1