From a67e57417e91344c85206244e147f4c442b4a576 Mon Sep 17 00:00:00 2001 From: khalil Date: Thu, 8 May 2025 18:30:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B8=E8=BF=9025-pool-=E6=A0=B9=E6=8D=AEcur?= =?UTF-8?q?PoolType=E5=BB=B6=E7=BB=AD=E5=8E=BBselectPool?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/service/lucky/Lucky25PoolService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/Lucky25PoolService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/Lucky25PoolService.java index 604a702d9..3b3edbbc7 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/Lucky25PoolService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/Lucky25PoolService.java @@ -242,7 +242,7 @@ public class Lucky25PoolService { BigDecimal todayProductionRatio = BigDecimal.ZERO.equals(output)? BigDecimal.ZERO: output.divide(input,2, RoundingMode.HALF_UP); if (input.compareTo(partitionConfig.getTodayInput()) >= 0 && todayProductionRatio.compareTo(partitionConfig.getTodayProductionRatio()) >= 0){ List excludePoolList = poolList.stream() - .filter(pool->pool.getType() == Lucky25PoolTypeEnum.NORMAL_POOL.getType()) + .filter(pool->pool.getType() == poolType.getType()) .filter(pool-> pool.getItemList().stream().noneMatch(poolItem->poolItem.getMulti() == 1000 && poolItem.getNum() > 0)) .filter(pool-> partitionConfig.getProductionRatio_N().compareTo(pool.getExpect()) > 0) .collect(Collectors.toList()); @@ -259,9 +259,9 @@ public class Lucky25PoolService { BigDecimal thisExpect = calExpect(config, partitionConfig, uid); List expectPoolList = BigDecimal.ZERO.compareTo(thisExpect) < 0 ? - poolList.stream().filter(pool->pool.getType() == Lucky25PoolTypeEnum.NORMAL_POOL.getType()) + poolList.stream().filter(pool->pool.getType() == poolType.getType()) .filter(pool->pool.getExpect().compareTo(thisExpect) > 0).collect(Collectors.toList()): - poolList.stream().filter(pool->pool.getType() == Lucky25PoolTypeEnum.NORMAL_POOL.getType()) + poolList.stream().filter(pool->pool.getType() == poolType.getType()) .filter(pool->thisExpect.negate().compareTo(pool.getExpect()) >= 0).collect(Collectors.toList()); if (CollectionUtils.isEmpty(expectPoolList)){