From d2e212b91d7fc19d040600ac272be65932802ed3 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 21 Feb 2024 20:58:22 +0800 Subject: [PATCH] Merge branch 'blnka-vip' into blnka --- src/main/java/cc/mrbird/febs/vip/controller/ViewVipConfigController.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/vip/controller/ViewVipConfigController.java b/src/main/java/cc/mrbird/febs/vip/controller/ViewVipConfigController.java index 8cc41bc..fdcf2d5 100644 --- a/src/main/java/cc/mrbird/febs/vip/controller/ViewVipConfigController.java +++ b/src/main/java/cc/mrbird/febs/vip/controller/ViewVipConfigController.java @@ -76,6 +76,10 @@ List<Long> goodsIds = new ArrayList<>(); List<Long> couponIds = new ArrayList<>(); vipBenefits.getDetails().forEach(item -> { + if (StrUtil.isBlank(item.getContent())) { + return; + } + if (item.getIsClick() == 2) { return; } @@ -103,6 +107,10 @@ Map<Long, MallGoodsCoupon> couponMap = coupons.stream().collect(Collectors.toMap(MallGoodsCoupon::getId, MallGoodsCoupon -> MallGoodsCoupon)); vipBenefits.getDetails().forEach(item -> { + if (StrUtil.isBlank(item.getContent())) { + return; + } + if (item.getIsClick() == 2) { return; } -- Gitblit v1.9.1