20221227 充值归集

xiaoyong931011

2023-01-06 18522ab4afb6c35d2915f4f8fe2102126c2651e0

20221227 充值归集

 src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java

@@ -22,7 +22,7 @@

    /**
     * 代理等级
     *  value : {"levelSelf":"一星","directLevelCnt":"3","teamLevelCnt":"5","minTeamLevelCnt":"2","ManageSubsidyPercent":"2"}
     *  value : {"levelSelf":"一星","directLevelCnt":"3","teamLevelCnt":"5","minTeamLevelCnt":"0","manageSubsidyPercent":"2","subsidyPercent":"0"}
     *  levelSelf:自身星级
     *  directLevelCnt：直推星级数量
     *  teamLevelCnt：团队星级数量

 src/main/java/cc/mrbird/febs/common/enumerates/MemberAgentLevelEnum.java

@@ -4,12 +4,12 @@

@Getter
public enum MemberAgentLevelEnum {
    AGENT_FIVE("总代","AGENT_FIVE",5),//总代
    AGENT_FOUR("省代","AGENT_FOUR",4),//省代
    AGENT_THREE("市代","AGENT_THREE",3),//市代
    AGENT_TWO("县代","AGENT_TWO",2),//县代
    AGENT_ONE("区代","AGENT_ONE",1),//区代
    AGENT("代理","AGENT",0);//会员
    AGENT_FIVE("VIP5","AGENT_FIVE",5),//总代
    AGENT_FOUR("VIP4","AGENT_FOUR",4),//省代
    AGENT_THREE("VIP3","AGENT_THREE",3),//市代
    AGENT_TWO("VIP2","AGENT_TWO",2),//县代
    AGENT_ONE("VIP1","AGENT_ONE",1),//区代
    AGENT("VIP","AGENT",0);//会员

    private String name;
    private String code;

 src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java

@@ -47,6 +47,15 @@
        return FebsUtil.view("modules/system/profitSetting");
    }

    /**
     * 会员等级设置
     * @return
     */
    @GetMapping("agentLevelSetting")
    public String agentLevelSetting() {
        return FebsUtil.view("modules/system/agentLevelSetting");
    }

    @GetMapping("cashOutSetting")
    @RequiresPermissions("cashOutSetting:update")
    public String cashOutSetting(Model model) {

 src/main/resources/application-dev.yml

@@ -68,4 +68,4 @@
    domain: https://openapi.alipaydev.com/gateway.do

system:
  chain-listener: true
  chain-listener: false

 src/main/resources/mapper/modules/MallMemberMapper.xml

@@ -151,7 +151,7 @@
        FROM mall_member m
        left join data_dictionary_custom a on a.description = m.level
        <where>
            and m.level != '代理'
            and m.level != 'VIP'
            <if test="record != null" >
                <if test="record.name!=null and record.name!=''">
                    and m.name like concat('%',  #{record.name},'%')

 src/main/resources/templates/febs/views/modules/system/agentLevelSetting.html

New file
@@ -0,0 +1,131 @@
<div class="layui-fluid layui-anim febs-anim" id="agentLevelSet" lay-title="代理级别设置">
    <div class="layui-row layui-col-space8 febs-container">
        <form class="layui-form" action="" lay-filter="agentLevelSet-form">
            <div class="layui-card">
                <div class="layui-card-body">
                    <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                        <ul class="layui-tab-title">
                            <li  class="layui-this">级别设置</li>
                        </ul>
                        <div class="layui-tab-content">
                            <div class="layui-tab-item  layui-show">
                                <table id="levelSetTable" lay-filter="levelSetTable"></table>
                                <div class="layui-word-aux">注意：</div>
                                <div class="layui-word-aux">1、修改数据，直接点击对应单元格，输入修改内容，点击保存即可</div>
                            </div>
                        </div>
                    </div>
                </div>

                <div class="layui-card-footer">
                    <button class="layui-btn layui-btn-normal" lay-submit="" lay-filter="agentLevelSet-form-submit" id="submit">保存</button>
                </div>
            </div>
        </form>
    </div>
</div>
<style>
    .layui-form-label {
        width: 120px;
    }

    .layui-form-item .layui-input-block {
        margin-left: 150px;
    }

    .layui-table-form .layui-form-item {
        margin-bottom: 20px !important;
    }
</style>
<script data-th-inline="javascript" type="text/javascript">
    layui.use(['dropdown', 'jquery', 'validate', 'febs', 'form', 'eleTree', 'table'], function () {
        var $ = layui.jquery,
            febs = layui.febs,
            form = layui.form,
            table = layui.table,
            validate = layui.validate,
            $view = $('#agentLevelSet')
            , levelSetArr;

        form.verify(validate);
        form.render();

        table.render({
            elem: '#levelSetTable'
            ,cols: [[ //表头
                {field: 'description', title: '等级',},
                {field: 'levelSelf', title: '自身星级',},
                {field: 'directLevelCnt', title: '直推星级数量',edit:'text'},
                ,{field: 'teamLevelCnt', title: '团队星级数量', edit:'text'}
                ,{field: 'minTeamLevelCnt', title: '两个市场均有上一个代理等级', edit:'text'}
                ,{field: 'manageSubsidyPercent', title: '团队管理补贴百分比例', edit:'text'}
                ,{field: 'subsidyPercent', title: '平级团队管理补贴百分比例', edit:'text'}
                ,{field: 'type', title: '类型', hide:'true'}
                ,{field: 'code', title: '编码', hide:'true'}
            ]]
            ,data: []
        });
        table.on('edit(levelSetTable)', function(obj){
            var value = obj.value //得到修改后的值
                ,data = obj.data //得到所在行所有键值
                ,field = obj.field; //得到字段
            for (let i = 0; i < levelSetArr.length; i++) {
                if (levelSetArr[i].code === data.code) {
                    var valueData = {};
                    valueData.levelSelf = data.levelSelf;
                    valueData.directLevelCnt = data.directLevelCnt;
                    valueData.teamLevelCnt = data.teamLevelCnt;
                    valueData.minTeamLevelCnt = data.minTeamLevelCnt;
                    valueData.manageSubsidyPercent = data.manageSubsidyPercent;
                    valueData.subsidyPercent = data.subsidyPercent;
                    levelSetArr[i].value = JSON.stringify(valueData);
                }
            }
        });

        dicDataReq("MEMBER_AGENT_LEVEL");
        function dicDataReq(type) {
            $.get(ctx + 'admin/common/findDicByType/' + type, function (r) {
                if (r.code === 200) {
                    let levelList = r.data;
                    if ("MEMBER_AGENT_LEVEL" == type) {
                        for (let i = 0; i < levelList.length; i++) {
                            levelList[i].levelSelf = JSON.parse(levelList[i].value).levelSelf;
                            levelList[i].directLevelCnt = JSON.parse(levelList[i].value).directLevelCnt;
                            levelList[i].teamLevelCnt = JSON.parse(levelList[i].value).teamLevelCnt;
                            levelList[i].minTeamLevelCnt = JSON.parse(levelList[i].value).minTeamLevelCnt;
                            levelList[i].manageSubsidyPercent = JSON.parse(levelList[i].value).manageSubsidyPercent;
                            levelList[i].subsidyPercent = JSON.parse(levelList[i].value).subsidyPercent;
                        }
                        levelSetArr = levelList;
                        console.log(levelList);
                        table.reload('levelSetTable', {
                            data : levelList
                        });
                    }
                }
            });
        }

        form.on('submit(agentLevelSet-form-submit)', function (data) {
            data.field.levelSetTable = levelSetArr;
            $.ajax({
                'url':ctx + 'admin/system/bonusSystemSetting',
                'type':'post',
                'dataType':'json',
                'headers' : {'Content-Type' : 'application/json;charset=utf-8'},
                'traditional': true,
                'data':JSON.stringify(data.field),
                'success':function (data) {
                    if (data.code == 200) {
                        febs.alert.success(data.message);
                    }
                },
                'error':function () {
                    febs.alert.warn('服务器繁忙');
                }
            })
            return false;
        });
    });
</script>

 src/main/resources/templates/febs/views/modules/system/cashOutSetting.html

@@ -23,7 +23,7 @@
                            <input type="text" name="serviceFee" data-th-id="${cashout.serviceFee}"
                                   lay-verify="text" autocomplete="off" class="layui-input" >
                        </div>
                        <div class="layui-word-aux" style="margin-left: 150px;">提现手续费:直接输入百分比，例如25%，直接输入25</div>
<!--                        <div class="layui-word-aux" style="margin-left: 150px;">提现手续费:直接输入百分比，例如25%，直接输入25</div>-->

                    </div>
                    <div class="layui-form-item">