diff --git a/src/main/java/com/peanut/modules/medical/service/impl/VipBuyConfigServiceImpl.java b/src/main/java/com/peanut/modules/medical/service/impl/VipBuyConfigServiceImpl.java index a29c505d..4f6e5cd1 100644 --- a/src/main/java/com/peanut/modules/medical/service/impl/VipBuyConfigServiceImpl.java +++ b/src/main/java/com/peanut/modules/medical/service/impl/VipBuyConfigServiceImpl.java @@ -80,10 +80,10 @@ public class VipBuyConfigServiceImpl extends ServiceImpl> flag = new HashMap<>(); - List collect = vipBuyConfigEntities.stream().filter(r -> r.getType() == 1&&r.getDateType()==0).collect(Collectors.toList()); - List collect1 = vipBuyConfigEntities.stream().filter(r -> r.getType() == 2&&r.getDateType()==0).collect(Collectors.toList()); - List collect2 = vipBuyConfigEntities.stream().filter(r -> r.getType() == 1 && r.getDateType() == 1).collect(Collectors.toList()); - List collect3 = vipBuyConfigEntities.stream().filter(r -> r.getType() == 2 && r.getDateType() == 1).collect(Collectors.toList()); + List collect = vipBuyConfigEntities.stream().filter(r -> r.getType() == 1).collect(Collectors.toList()); + List collect1 = vipBuyConfigEntities.stream().filter(r -> r.getType() == 2).collect(Collectors.toList()); + List collect2 = null;//vipBuyConfigEntities.stream().filter(r -> r.getType() == 1 && r.getDateType() == 1).collect(Collectors.toList()); + List collect3 = null;//vipBuyConfigEntities.stream().filter(r -> r.getType() == 2 && r.getDateType() == 1).collect(Collectors.toList()); flag.put("super",collect); flag.put("sociology",collect1); flag.put("super_hd",collect2); diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/VipBuyConfigServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/VipBuyConfigServiceImpl.java index 64dd9db3..52afe15e 100644 --- a/src/main/java/com/peanut/modules/sociology/service/impl/VipBuyConfigServiceImpl.java +++ b/src/main/java/com/peanut/modules/sociology/service/impl/VipBuyConfigServiceImpl.java @@ -84,10 +84,10 @@ public class VipBuyConfigServiceImpl extends ServiceImpl> flag = new HashMap<>(); - List collect = vipBuyConfigEntities.stream().filter(r -> r.getType() == 1&&r.getDateType()==0).collect(Collectors.toList()); - List collect1 = vipBuyConfigEntities.stream().filter(r -> r.getType() == 3&&r.getDateType()==0).collect(Collectors.toList()); - List collect2 = vipBuyConfigEntities.stream().filter(r -> r.getType() == 1 && r.getDateType() == 1).collect(Collectors.toList()); - List collect3 = vipBuyConfigEntities.stream().filter(r -> r.getType() == 3 && r.getDateType() == 1).collect(Collectors.toList()); + List collect = vipBuyConfigEntities.stream().filter(r -> r.getType() == 1).collect(Collectors.toList()); + List collect1 = vipBuyConfigEntities.stream().filter(r -> r.getType() == 3).collect(Collectors.toList()); + List collect2 = null;//vipBuyConfigEntities.stream().filter(r -> r.getType() == 1 && r.getDateType() == 1).collect(Collectors.toList()); + List collect3 = null;//vipBuyConfigEntities.stream().filter(r -> r.getType() == 3 && r.getDateType() == 1).collect(Collectors.toList()); flag.put("super",collect); flag.put("sociology",collect1); flag.put("super_hd",collect2);