From 2639884eefc79df3f05b8d74dc06629336a58669 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Thu, 6 Jun 2024 11:05:41 +0800 Subject: [PATCH] =?UTF-8?q?vip=E8=B4=AD=E4=B9=B0=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/VipBuyConfigServiceImpl.java | 12 ++++++++---- .../service/impl/VipBuyConfigServiceImpl.java | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) 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 9b3e8021..d32b01d5 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,14 @@ public class VipBuyConfigServiceImpl extends ServiceImpl> flag = new HashMap<>(); - List collect = vipBuyConfigEntities.stream().filter(r -> r.getType() == 1).collect(Collectors.toList()); - List collect1 = vipBuyConfigEntities.stream().filter(r -> r.getType() == 2).collect(Collectors.toList()); - if(collect.size()>0) flag.put("super",collect); - if(collect1.size()>0) flag.put("medicine",collect1); + 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()); + flag.put("super",collect); + flag.put("sociology",collect1); + flag.put("super_hd",collect2); + flag.put("sociology_hd",collect3); return R.ok().put("list",flag); } } 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 9aec79d7..96e66ab2 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,14 @@ public class VipBuyConfigServiceImpl extends ServiceImpl> flag = new HashMap<>(); - List collect = vipBuyConfigEntities.stream().filter(r -> r.getType() == 1).collect(Collectors.toList()); - List collect1 = vipBuyConfigEntities.stream().filter(r -> r.getType() == 3).collect(Collectors.toList()); - if(collect.size()>0) flag.put("super",collect); - if(collect1.size()>0) flag.put("sociology",collect1); + 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()); + flag.put("super",collect); + flag.put("sociology",collect1); + flag.put("super_hd",collect2); + flag.put("sociology_hd",collect3); return R.ok().put("list",flag); } }