From 3b598f6d6b008db9e28ab446f4a21d98dcea382d Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 21 Feb 2024 20:58:00 +0800 Subject: [PATCH] fix --- src/test/java/cc/mrbird/febs/AgentTest.java | 2 +- src/main/resources/mapper/modules/MallVipConfigMapper.xml | 4 ++++ src/main/resources/templates/febs/views/modules/vip/vipBenefits-add.html | 1 + src/main/java/cc/mrbird/febs/vip/controller/ViewVipConfigController.java | 8 ++++++++ 4 files changed, 14 insertions(+), 1 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; } diff --git a/src/main/resources/mapper/modules/MallVipConfigMapper.xml b/src/main/resources/mapper/modules/MallVipConfigMapper.xml index 57a7c24..1424085 100644 --- a/src/main/resources/mapper/modules/MallVipConfigMapper.xml +++ b/src/main/resources/mapper/modules/MallVipConfigMapper.xml @@ -19,6 +19,8 @@ <id property="id" column="c_id" /> <result property="name" column="c_name" /> <result property="icon" column="c_icon" /> + <result property="scoreMultiple" column="score_multiple" /> + <result property="gainType" column="gain_type" /> <collection property="details" ofType="cc.mrbird.febs.vip.entity.MallVipBenefitsDetails"> <id property="id" column="d_id" /> @@ -50,6 +52,8 @@ ,benefits.id c_id ,benefits.name c_name ,benefits.icon c_icon + ,benefits.score_multiple + ,benefits.gain_type from mall_vip_config config inner join mall_vip_config_benefits configBenefits on config.id=configBenefits.config_id inner join mall_vip_benefits benefits on configBenefits.benefits_id=benefits.id diff --git a/src/main/resources/templates/febs/views/modules/vip/vipBenefits-add.html b/src/main/resources/templates/febs/views/modules/vip/vipBenefits-add.html index b1cb41b..08a7f5e 100644 --- a/src/main/resources/templates/febs/views/modules/vip/vipBenefits-add.html +++ b/src/main/resources/templates/febs/views/modules/vip/vipBenefits-add.html @@ -22,6 +22,7 @@ <select name="gainType" class="gain-type" lay-filter="gain-type-select"> <option value="1">会员日</option> <option value="2">会员生日</option> + <option value="3">其他</option> </select> </div> </div> diff --git a/src/test/java/cc/mrbird/febs/AgentTest.java b/src/test/java/cc/mrbird/febs/AgentTest.java index 9660007..a201510 100644 --- a/src/test/java/cc/mrbird/febs/AgentTest.java +++ b/src/test/java/cc/mrbird/febs/AgentTest.java @@ -810,6 +810,6 @@ @Test public void orderReturnTest() { - agentConsumer.getScoreMsg(212L); + agentConsumer.getScoreMsg(215L); } } -- Gitblit v1.9.1