幸运25-pool-根据curPoolType延续去selectPool
This commit is contained in:
@@ -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<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-> partitionConfig.getProductionRatio_N().compareTo(pool.getExpect()) > 0)
|
||||
.collect(Collectors.toList());
|
||||
@@ -259,9 +259,9 @@ public class Lucky25PoolService {
|
||||
|
||||
BigDecimal thisExpect = calExpect(config, partitionConfig, uid);
|
||||
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()):
|
||||
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)){
|
||||
|
Reference in New Issue
Block a user