From 43322c8a3d374c93f5dce2746d86bd56c3c57c91 Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Mon, 04 Aug 2025 15:25:56 +0800 Subject: [PATCH] feat(mall): 为 MallMember 实体添加 memberUuid 字段- 在 MallMember 类中添加 memberUuid 字段 - 该字段用于存储会员的 UUID --- src/main/java/cc/mrbird/febs/vip/controller/ViewVipConfigController.java | 11 +++++++++++ 1 files changed, 11 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 793ded0..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; } @@ -166,6 +174,9 @@ List<VipSettingUnAliveSettingBo> items = JSONObject.parseArray(couponData.getValue(), VipSettingUnAliveSettingBo.class); setting.setItems(items); } + + DataDictionaryCustom rule = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.VIP_SCORE_RULE.getType(), DataDictionaryEnum.VIP_SCORE_RULE.getCode()); + setting.setRule(rule.getValue()); model.addAttribute("vipSetting", setting); return FebsUtil.view("modules/vip/vip-setting"); } -- Gitblit v1.9.1