From bc4d530071edfb7f1bcff970b7039a1447859c1d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 29 Aug 2020 14:57:00 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
index 48b54c2..15a21e8 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -101,24 +101,37 @@
if (CollUtil.isNotEmpty(holdOrderEntities)) {
int maxCnt = 0;
int subCnt = 0;
+ int index = 0;
BigDecimal openPrice = BigDecimal.ZERO;
int type = 1;
BigDecimal feeAmount = BigDecimal.ZERO;
BigDecimal sku = BigDecimal.ZERO;
for (ContractHoldOrderEntity holdOrderEntity : holdOrderEntities) {
- if (holdOrderEntity.getSymbolCntSale() > maxCnt) {
- subCnt = holdOrderEntity.getSymbolCntSale() - maxCnt;
+ if (holdOrderEntity.getSymbolCntSale() >= maxCnt) {
+ int temp = maxCnt;
maxCnt = holdOrderEntity.getSymbolCntSale();
+ subCnt = holdOrderEntity.getSymbolCntSale() - temp;
openPrice = holdOrderEntity.getOpeningPrice();
type = holdOrderEntity.getOpeningType();
+ index++;
+ log.info("--{}, {}, {}, {}, {}", maxCnt, subCnt, openPrice, type, index);
+ }
+
+ if (index == 0) {
+ index ++;
+ maxCnt = holdOrderEntity.getSymbolCntSale();
+ subCnt = holdOrderEntity.getSymbolCntSale();
+ type = holdOrderEntity.getOpeningType();
+ openPrice = holdOrderEntity.getOpeningPrice();
+ log.info("---{}, {}, {}, {}, {}", maxCnt, subCnt, type, openPrice, index);
}
feeAmount = feeAmount.add(holdOrderEntity.getOpeningFeeAmount());
sku = holdOrderEntity.getSymbolSku();
}
BigDecimal forceSetPrice = BigDecimal.ZERO;
if (subCnt != 0) {
- log.info("{}, {}, {}, {}, {}", openPrice, subCnt, sku, type, maxCnt);
+ log.info("--->{}, {}, {}, {}, {}", openPrice, subCnt, sku, type, maxCnt);
forceSetPrice = getForceSetPrice(walletContract.getTotalBalance().subtract(feeAmount), openPrice, subCnt, sku, type, memberEntity);
}
@@ -128,7 +141,7 @@
updateHoldOrder.setIsCanClosing(ContractHoldOrderEntity.ORDER_CAN_CLOSING_Y);
holdOrderDao.updateById(updateHoldOrder);
- if (forceSetPrice.compareTo(BigDecimal.ZERO) >= 0) {
+ if (forceSetPrice.compareTo(BigDecimal.ZERO) > 0) {
// sendOrderBombMsg(updateHoldOrder.getId(), updateHoldOrder.getOpeningType(), forceSetPrice, updateHoldOrder.getSymbol(), updateHoldOrder.getOperateNo());
}
}
--
Gitblit v1.9.1