From 23b0441e0011ccdb005c6d308500869ec202b782 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 28 Aug 2020 19:25:14 +0800 Subject: [PATCH] modify --- src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java index 924697a..8bbce66 100644 --- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java +++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java @@ -101,25 +101,30 @@ 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; - boolean flag = false; for (ContractHoldOrderEntity holdOrderEntity : holdOrderEntities) { - if (holdOrderEntity.getSymbolCntSale() == maxCnt) { - flag = true; - return; - } - - if (holdOrderEntity.getSymbolCntSale() > maxCnt) { + if (holdOrderEntity.getSymbolCntSale() >= maxCnt) { + int temp = maxCnt; maxCnt = holdOrderEntity.getSymbolCntSale(); - subCnt = holdOrderEntity.getSymbolCntSale() - maxCnt; + subCnt = holdOrderEntity.getSymbolCntSale() - temp; openPrice = holdOrderEntity.getOpeningPrice(); type = holdOrderEntity.getOpeningType(); + index++; } + if (index == 0) { + index ++; + maxCnt = holdOrderEntity.getSymbolCntSale(); + subCnt = holdOrderEntity.getSymbolCntSale(); + type = holdOrderEntity.getOpeningType(); + openPrice = holdOrderEntity.getOpeningPrice(); + log.info("{}, {}, {}, {}", maxCnt, subCnt, type, openPrice); + } feeAmount = feeAmount.add(holdOrderEntity.getOpeningFeeAmount()); sku = holdOrderEntity.getSymbolSku(); } -- Gitblit v1.9.1