fix
Hentua
2024-01-26 67366adf8a0105177b517894461c8fe40f4e703a
fix
1 files added
5 files modified
149 ■■■■■ changed files
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java 6 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java 13 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/vip/controller/AdminMallVipConfigController.java 8 ●●●●● patch | view | raw | blame | history
src/main/resources/mapper/modules/MallMemberMapper.xml 4 ●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html 26 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/mallMember/vip-level-setting.html 92 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -606,4 +606,10 @@
        return mallMemberService.salemanCoupon(mallmember);
    }
    @PostMapping("vipLevelSetUpdate")
    public FebsResponse vipLevelSetUpdate(MallMember member) {
        mallMemberService.updateById(member);
        return new FebsResponse().success().message("操作成功");
    }
}
src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -18,6 +18,9 @@
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import java.util.HashMap;
import java.util.Map;
@Controller("mallMemberView")
@RequestMapping(FebsConstant.VIEW_PREFIX + "modules/mallMember")
@RequiredArgsConstructor
@@ -399,5 +402,15 @@
        return FebsUtil.view("modules/mallMember/couponSelect");
    }
    @GetMapping("vipLevelSetting/{id}")
    public String vipLevelSetting(@PathVariable(value = "id") String id, Model model) {
        MallMember mallMember = mallMemberMapper.selectById(id);
        Map<String, Object> data = new HashMap<>();
        data.put("id", mallMember.getId());
        data.put("level", mallMember.getLevel());
        model.addAttribute("vipLevelSet", data);
        return FebsUtil.view("modules/mallMember/vip-level-setting");
    }
}
src/main/java/cc/mrbird/febs/vip/controller/AdminMallVipConfigController.java
@@ -8,10 +8,13 @@
import cc.mrbird.febs.vip.entity.MallVipConfig;
import cc.mrbird.febs.vip.service.IMallVipConfigService;
import cc.mrbird.febs.vip.vo.VipSettingVo;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
 * 会员配置接口类
@@ -62,4 +65,9 @@
        commonService.addDataDic(DataDictionaryEnum.UNALIVE_COUPON.getType(), DataDictionaryEnum.UNALIVE_COUPON.getCode(), vipSettingVo.getItems(), "失活会员优惠券配置", true);
        return new FebsResponse().success();
    }
    @GetMapping(value = "/allList")
    public FebsResponse allList() {
        return new FebsResponse().success().data(mallVipConfigService.list());
    }
}
src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -4,11 +4,11 @@
    <select id="selectMallMemberListInPage" resultType="cc.mrbird.febs.mall.entity.MallMember">
        SELECT m.*,a.name referrerName,IFNULL(c.balance,0) balance,IFNULL(c.score,0) score,IFNULL(c.prize_score,0) prizeScore,IFNULL(c.commission,0) commission
        ,d.description levelName
        ,vipConfig.name levelName
        FROM mall_member m
        left join mall_member a on m.referrer_id = a.invite_id
        LEFT JOIN mall_member_wallet c on c.member_id = m.id
        LEFT JOIN data_dictionary_custom d on d.code = m.level and type='AGENT_LEVEL'
        left join mall_vip_config vipConfig on m.level = vipConfig.code
        <where>
            <if test="record != null" >
                <if test="record.name!=null and record.name!=''">
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -111,6 +111,7 @@
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="updateReferer">修改推荐人</button>
        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="updateVipLevel">修改会员等级</button>
<!--        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="registMember">添加会员</button>-->
<!--        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="balance">拨付余额</button>-->
<!--        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="score">拨付赠送积分</button>-->
@@ -294,10 +295,10 @@
                    {field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
                    {field: 'balance', title: '余额', minWidth: 100,align:'left'},
                    // {field: 'score', title: '赠送积分', minWidth: 100,align:'left'},
                    // {field: 'prizeScore', title: '竞猜积分', minWidth: 100,align:'left'},
                    {field: 'prizeScore', title: '积分', minWidth: 100,align:'left'},
                    // {field: 'commission', title: '佣金', minWidth: 100,align:'left'},
                    {field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
                    {field: 'levelName', title: '会员类型', minWidth: 100,align:'left'},
                    {field: 'levelName', title: '会员等级', minWidth: 100,align:'left'},
                    // {field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
                    {field: 'isSalesman', title: '推销员设置', templet: '#isSalesmanSwitch', minWidth: 100,align:'center'},
                    // {field: 'director', title: '总监', templet:'#switchDirector', minWidth: 100},
@@ -376,6 +377,27 @@
                });
            }
            if (layEvent === 'updateVipLevel') {
                var checkData = table.checkStatus('userTable').data;
                if (checkData.length > 1) {
                    febs.alert.warn('每次只能修改一个用户');
                    return;
                }
                // var idList = [];
                // for (var i = 0; i < checkData.length; i++) {
                //     idList.push(checkData[i].id);
                // }
                febs.modal.open('设置会员等级', 'modules/mallMember/vipLevelSetting/' + checkData[0].id, {
                    btn: ['确认', '取消'],
                    yes: function (index, layero) {
                        $('#vip-level-set').find('#submit').trigger('click');
                    },
                    btn2: function () {
                        layer.closeAll();
                    }
                });
            }
            if (layEvent === 'resetPwd') {
                febs.modal.confirm('重置登录密码', '是否重置选中账号登录密码?', function () {
                    var ids = [];
src/main/resources/templates/febs/views/modules/mallMember/vip-level-setting.html
New file
@@ -0,0 +1,92 @@
<style>
    #vip-level-set {
        padding: 20px 25px 25px 0;
    }
    #vip-level-set .layui-treeSelect .ztree li a, .ztree li span {
        margin: 0 0 2px 3px !important;
    }
    #vip-level-set #data-permission-tree-block {
        border: 1px solid #eee;
        border-radius: 2px;
        padding: 3px 0;
    }
    #vip-level-set .layui-treeSelect .ztree li span.button.switch {
        top: 1px;
        left: 3px;
    }
</style>
<div class="layui-fluid" id="vip-level-set">
    <form class="layui-form" action="" lay-filter="vip-level-set-form">
        <div class="layui-form-item febs-hide">
            <label class="layui-form-label febs-form-item-require">id:</label>
            <div class="layui-input-block">
                <input type="text" name="id">
            </div>
        </div>
        <div class="layui-form-item">
            <div class="layui-inline">
                <label class="layui-form-label">会员等级:</label>
                <div class="layui-input-inline">
                    <select lay-verify="required" name="level" class="vip-level-set-level" id="levelSet">
                        <option value="">请选择</option>
                    </select>
                </div>
            </div>
        </div>
        <div class="layui-form-item febs-hide">
            <button class="layui-btn" lay-submit="" lay-filter="vip-level-set-form-submit" id="submit"></button>
        </div>
    </form>
</div>
<script data-th-inline="javascript">
    layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree'], function () {
        var $ = layui.jquery,
            febs = layui.febs,
            layer = layui.layer,
            formSelects = layui.formSelects,
            treeSelect = layui.treeSelect,
            form = layui.form,
            eleTree = layui.eleTree,
            vipLevelSet = [[${vipLevelSet}]],
            $view = $('#vip-level-set'),
            validate = layui.validate,
            _deptTree;
        form.render();
        initUserValue();
        function initUserValue() {
            form.val("vip-level-set-form", {
                "id": vipLevelSet.id,
                "level": vipLevelSet.level
            });
        }
        //(下拉框)
        $.get(ctx + 'admin/vip/config/allList', function (res) {
            var data = res.data;
            for (var k in data)
            {
                $(".vip-level-set-level").append("<option value='" + data[k].code + "'>" + data[k].name + "</option>");
            }
            layui.use('form', function () {
                var form = layui.form;
                $("#levelSet").val(vipLevelSet.level)
                form.render();
            });
        });
        form.on('submit(vip-level-set-form-submit)', function (data) {
            febs.post(ctx + 'admin/mallMember/vipLevelSetUpdate', data.field, function () {
                layer.closeAll();
                febs.alert.success('操作成功');
                $('#febs-member-list').find('#reset').click();
            });
            return false;
        });
    });
</script>