Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz

xiaoyong931011

2022-06-17 1c07a716a87fe386ff3a3492a659912981ea31a7

Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz

 src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html

@@ -227,11 +227,11 @@
                    {type: 'checkbox'},
                    {field: 'phone', title: '账号', minWidth: 150,align:'left'},
                    {field: 'name', title: '名称', minWidth: 100,align:'left'},
                    {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: 'commission', title: '佣金', minWidth: 100,align:'left'},
                    {field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
                    {field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
                    {field: 'levelName', title: '会员类型', minWidth: 100,align:'left'},
                    {field: 'storeMaster', title: '店长', templet:'#switchStoreMaster', minWidth: 100},

 src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html

@@ -118,7 +118,6 @@
                cols: [[
                    {field: 'name', title: '名称', minWidth: 100,align:'left'},
                    {field: 'phone', title: '账号', minWidth: 150,align:'left'},
                    {field: 'bindPhone', title: '手机号', minWidth: 150,align:'left'},
                    {field: 'amount', title: '金额', minWidth: 150,align:'left'},
                    {field: 'type', title: '流水类型',
                        templet: function (d) {

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

@@ -52,11 +52,6 @@
        margin-bottom: 20px !important;
    }
</style>
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-danger layui-btn-sm" type="button" lay-event="delSku">删除</button>
    </div>
</script>
<script type="text/html" id="bonusSystem">
    {{#  layui.each(d, function(index, item){ }}
    <div class="layui-form-item">

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

@@ -35,7 +35,7 @@

    @Test
    public void dynamicProfit() {
        memberProfitService.dynamicProfit(16L);
        memberProfitService.dynamicProfit(21L);
    }
    @Test
    public void agentProfit() {