fix

Hentua

2024-02-22 86f2368f146af23c9e16507f790752e79858a29f

fix

 src/main/java/cc/mrbird/febs/vip/controller/AdminMallVipBenefitsController.java

@@ -56,4 +56,10 @@
    public FebsResponse findAllBenefits() {
        return new FebsResponse().success().data(mallVipBenefitsService.list());
    }

    @PostMapping(value = "/switchBenefitsShow/{id}")
    public FebsResponse switchBenefitsShow(@PathVariable("id") Long id) {
        mallVipBenefitsService.switchBenefitsShow(id);
        return new FebsResponse().success().data("设置成功");
    }
}

 src/main/java/cc/mrbird/febs/vip/entity/MallVipBenefits.java

@@ -47,6 +47,11 @@
     */
    private String remark;

    /**
     * 是否在小程序上显示
     */
    private Integer isShow;

    @TableField(exist = false)
    private Integer isJump;


 src/main/java/cc/mrbird/febs/vip/service/IMallVipBenefitsService.java

@@ -18,4 +18,6 @@
    void editVipBenefits(MallVipBenefits mallVipBenefits);

    void getBenefits(Long id);

    void switchBenefitsShow(Long id);
}

 src/main/java/cc/mrbird/febs/vip/service/impl/MallVipBenefitsServiceImpl.java

@@ -282,4 +282,18 @@
        mallVipBenefitsRecordMapper.insert(record);
    }

    @Override
    public void switchBenefitsShow(Long id) {
        MallVipBenefits vipBenefits = this.baseMapper.selectById(id);

        MallVipBenefits update = new MallVipBenefits();
        if (vipBenefits.getIsShow() == 1) {
            update.setIsShow(2);
        } else {
            update.setIsShow(1);
        }

        update.setId(vipBenefits.getId());
        this.baseMapper.updateById(update);
    }
}

 src/main/java/cc/mrbird/febs/vip/service/impl/MallVipConfigServiceImpl.java

@@ -48,7 +48,9 @@
    public List<MallVipConfig> findConfigList() {
        List<MallVipConfig> configs = this.baseMapper.selectVipConfigList();
        configs.forEach(item -> {
            item.getBenefits().forEach(benefits -> {
            item.getBenefits().stream().filter(benefit -> {
                return benefit.getIsShow() == 1;
            }).forEach(benefits -> {
                benefits.setIsJump(CollUtil.isEmpty(benefits.getDetails()) ? 2 : 1);
            });
        });
@@ -151,6 +153,10 @@
                return false;
            }

            if (item.getGainType() == 3 && item.getScoreMultiple() != null) {
                return true;
            }

            // 生日权益
            if (item.getGainType() == 2 && isBirthday) {
                return true;

 src/main/resources/templates/febs/views/modules/vip/vip-setting.html

@@ -55,7 +55,7 @@
    }
</style>

<script type="text/html" id="toolbar">
<script type="text/html" id="toolbar1">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm" type="button" lay-event="addCoupon">新增</button>
        <button class="layui-btn layui-btn-danger layui-btn-sm" type="button" lay-event="delCoupon">删除</button>
@@ -90,7 +90,7 @@

        table.render({
            elem: '#unAliveCouponItem'
            ,toolbar:"#toolbar"
            ,toolbar:"#toolbar1"
            ,cols: [[ //表头
                {type: 'checkbox'}
                , {field: 'day', title: '失活天数', edit:'text', width:250}

 src/main/resources/templates/febs/views/modules/vip/vipBenefits-edit.html

@@ -28,6 +28,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>

 src/main/resources/templates/febs/views/modules/vip/vipBenefits-list.html

@@ -40,6 +40,14 @@
    <a lay-event="edit" shiro:hasPermission="vipBenefits:update"><i
            class="layui-icon febs-edit-area febs-blue">&#xe7a5;</i></a>
</script>

<script type="text/html" id="isShowSwitch">
    {{# if(d.isShow === 1) { }}
    <input type="checkbox" value={{d.id}} lay-text="显示|隐藏" checked lay-skin="switch" lay-filter="isShowSwitch">
    {{# } else { }}
    <input type="checkbox" value={{d.id}} lay-text="显示|隐藏" lay-skin="switch" lay-filter="isShowSwitch">
    {{# } }}
</script>
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
    // 引入组件并初始化
@@ -128,6 +136,7 @@
                            return '<a lay-event="seeImgThumb"><img id="seeImgThumb'+d.id+'" src="'+d.icon+'" alt=""></a>';
                        }, minWidth: 150, align: 'center'
                    },
                    {templet: '#isShowSwitch', title: '是否在小程序显示', minWidth: 120, align: 'center'},
                    {field: 'remark', title: '备注', minWidth: 120, align: 'center'},
                    {field: 'createdTime', title: '创建时间', minWidth: 120, align: 'center'},
                    {
@@ -147,19 +156,11 @@
            };
        }

        form.on('switch(isTopSwitch)', function (data) {
            console.log(data.value);
            if (data.elem.checked) {
                febs.post(ctx + 'admin/news/topNews/' + data.value, null, function () {
        form.on('switch(isShowSwitch)', function (data) {
            febs.post(ctx + 'admin/vip/benefits/switchBenefitsShow/' + data.value, null, function () {
                    febs.alert.success('设置成功');
                    $query.click();
                });
            } else {
                febs.post(ctx + 'admin/news/unTopNews/' + data.value, null, function () {
                    febs.alert.success('设置成功');
                    $query.click();
                });
            }
        })
    })
</script>

 src/test/java/cc/mrbird/febs/ProfitTest.java

@@ -971,6 +971,6 @@
    @Test
    public void aaaTest() {
//        agentConsumer.vipLevelUp(133L);
        agentConsumer.getScoreMsg(152L);
        agentConsumer.getScoreMsg(217L);
    }
}