moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

幸运25-pool-根据curPoolType延续去selectPool

Browse Source
This commit is contained in:
khalil
2025-05-08 18:30:22 +08:00
parent 2f243bf2ea
commit a67e57417e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/Lucky25PoolService.java
View File

@@ -242,7 +242,7 @@ public class Lucky25PoolService {
BigDecimal todayProductionRatio = BigDecimal.ZERO.equals(output)? BigDecimal.ZERO: output.divide(input,2, RoundingMode.HALF_UP); 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){ if (input.compareTo(partitionConfig.getTodayInput()) >= 0 && todayProductionRatio.compareTo(partitionConfig.getTodayProductionRatio()) >= 0){
List<Lucky25Pool> excludePoolList = poolList.stream() List<Lucky25Pool> 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-> pool.getItemList().stream().noneMatch(poolItem->poolItem.getMulti() == 1000 && poolItem.getNum() > 0))
.filter(pool-> partitionConfig.getProductionRatio_N().compareTo(pool.getExpect()) > 0) .filter(pool-> partitionConfig.getProductionRatio_N().compareTo(pool.getExpect()) > 0)
.collect(Collectors.toList()); .collect(Collectors.toList());
@@ -259,9 +259,9 @@ public class Lucky25PoolService {
BigDecimal thisExpect = calExpect(config, partitionConfig, uid); BigDecimal thisExpect = calExpect(config, partitionConfig, uid);
List<Lucky25Pool> expectPoolList = BigDecimal.ZERO.compareTo(thisExpect) < 0 ? List<Lucky25Pool> 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()): .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()); .filter(pool->thisExpect.negate().compareTo(pool.getExpect()) >= 0).collect(Collectors.toList());
if (CollectionUtils.isEmpty(expectPoolList)){ if (CollectionUtils.isEmpty(expectPoolList)){