|
@@ -562,7 +562,9 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
|
|
|
new String[]{"0", "1", "2"}, StrUtil.isNotBlank(wmScorePackage.getId()) ?
|
|
|
new String[]{wmScorePackage.getId()} : null);
|
|
|
// 过滤可分配积分值为0的
|
|
|
- List<WmScorePackage> packageList = pkgList.stream().filter(p -> p.getKfpjf() > 0).collect(Collectors.toList());
|
|
|
+ List<WmScorePackage> packageList = pkgList.stream()
|
|
|
+ .filter(p -> p.getKfpjf() > 0 && !LocalDate.now().isAfter(p.getEndTime()))
|
|
|
+ .collect(Collectors.toList());
|
|
|
|
|
|
log.info("查询关联积分包值耗时:{}ms", System.currentTimeMillis() - start);
|
|
|
|