From 45c8db9f7f9b05480d5234177e6743fd0c8a1e40 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Wed, 22 Jan 2025 18:02:09 +0800 Subject: [PATCH] refactor(mall): 重构订单确认和删除方法的验证逻辑 - 使用 ValidateEntityUtils 工具类统一处理实体验证逻辑 - 提高代码复用性,减少重复代码 - 增加 ensureNotEqual 方法用于验证两个值不相等 --- 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