From 7a372033d44ba48383d9d1bc97e5d583b26a266f Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 22 Aug 2024 16:41:59 +0800
Subject: [PATCH] 后台

---
 src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html |  336 ++++++++-----------------------------------------------
 1 files changed, 53 insertions(+), 283 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
index f0c866a..4239a45 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -8,40 +8,9 @@
                             <div class="layui-col-md10">
                                 <div class="layui-form-item">
                                     <div class="layui-inline">
-                                        <label class="layui-form-label">名称:</label>
+                                        <label class="layui-form-label">登录账户:</label>
                                         <div class="layui-input-inline">
-                                            <input type="text" placeholder="名称" name="name" autocomplete="off" class="layui-input">
-                                        </div>
-                                    </div>
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label">账号:</label>
-                                        <div class="layui-input-inline">
-                                            <input type="text" placeholder="账号/邀请码" name="account" autocomplete="off" class="layui-input">
-                                        </div>
-                                    </div>
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label">账户状态:</label>
-                                        <div class="layui-input-inline">
-                                            <select name="accountStatus">
-                                                <option value="">请选择</option>
-                                                <option value="1">正常</option>
-                                                <option value="2">禁用</option>
-                                            </select>
-                                        </div>
-                                    </div>
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label">会员类型:</label>
-                                        <div class="layui-input-inline">
-                                            <select name="level">
-                                                <option value="">请选择</option>
-                                                <option value="ZERO_LEVEL">普通会员</option>
-                                                <option value="SECOND_LEVEL">1星</option>
-                                                <option value="THIRD_LEVEL">2星</option>
-                                                <option value="FOUR_LEVEL">3星</option>
-                                                <option value="FIFTH_LEVEL">4星</option>
-                                                <option value="SIX_LEVEL">5星</option>
-                                                <option value="SEVEN_LEVEL">6星</option>
-                                            </select>
+                                            <input type="text" placeholder="登录账户" name="accountLogin" autocomplete="off" class="layui-input">
                                         </div>
                                     </div>
                                 </div>
@@ -75,27 +44,6 @@
     <input type="checkbox" value={{d.id}} lay-text="正常|禁用" lay-skin="switch" lay-filter="switchStatus">
     {{# } }}
 </script>
-<script type="text/html" id="switchStoreMaster">
-    {{# if(d.storeMaster === 1) { }}
-    <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="switchStoreMaster">
-    {{# } else { }}
-    <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="switchStoreMaster">
-    {{# } }}
-</script>
-<script type="text/html" id="switchDirector">
-    {{# if(d.director === 1) { }}
-    <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="switchDirector">
-    {{# } else { }}
-    <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="switchDirector">
-    {{# } }}
-</script>
-<script type="text/html" id="switchCreate">
-    {{# if(d.creater === 1) { }}
-    <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="switchCreate">
-    {{# } else { }}
-    <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="switchCreate">
-    {{# } }}
-</script>
 <script type="text/html" id="switchPartner">
     {{# if(d.partner === 1) { }}
     <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="switchPartner">
@@ -103,11 +51,11 @@
     <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="switchPartner">
     {{# } }}
 </script>
-<script type="text/html" id="switchInsideWith">
-    {{# if(d.insideWith === 1) { }}
-    <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="switchInsideWith">
+<script type="text/html" id="switchFrozenWith">
+    {{# if(d.isFrozen === 1) { }}
+    <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="switchFrozenWith">
     {{# } else { }}
-    <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="switchInsideWith">
+    <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="switchFrozenWith">
     {{# } }}
 </script>
 <style>
@@ -117,20 +65,14 @@
 </style>
 <script type="text/html" id="tableMemberBar">
     <div class="layui-btn-container">
-        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="addMember:update" lay-event="registMember">添加会员</button>
-        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="mallSystemPay:update" lay-event="balance">拨付余额</button>
-<!--        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="mallSystemPay:update" lay-event="score">拨付赠送积分</button>-->
-        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="mallSystemPay:update" lay-event="prizeScore">拨付现金积分</button>
+        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="mallSystemPay:update" lay-event="balance">拨付葫芦</button>
         <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="resetPwd:update" lay-event="resetPwd">重置登录密码</button>
-        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="resetPwd:update" lay-event="resetPayPwd">重置支付密码</button>
-        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="agentLevelSet:update" lay-event="agentLevel">设置代理等级</button>
-        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="voucherUpdate:update" lay-event="voucherUpdate">拨付绿色凭证</button>
     </div>
 </script>
 <!-- 表格操作栏 end -->
 <script data-th-inline="none" type="text/javascript">
     // 引入组件并初始化
-    layui.use([ 'jquery', 'form', 'table', 'febs'], function () {
+    layui.use([ 'jquery', 'form', 'table', 'upload','febs'], function () {
         var $ = layui.jquery,
             febs = layui.febs,
             form = layui.form,
@@ -158,47 +100,31 @@
             var data = obj.data,
                 layEvent = obj.event;
 
-            if (layEvent === 'close') {
-                febs.modal.confirm('禁用', '确认禁用该账号?', function () {
-                    closeAccount(data.id);
-                });
-            }
-            if (layEvent === 'open') {
-                febs.modal.confirm('开启', '确认开启该账号?', function () {
-                    openAccount(data.id);
-                });
-            }
-
-            if (layEvent === 'see') {
-                febs.modal.open( '个人信息', 'modules/mallMember/detail/' + data.id, {
-                    btn: ['提交', '取消'],
-                    yes: function (index, layero) {
-                        $('#user-update').find('#submit').trigger('click');
-                    },
-                    btn2: function () {
-                        layer.closeAll();
-                    }
-                });
-            }
-            if (layEvent === 'moneyFlow') {
-                febs.modal.open( '用户资金流水', 'modules/mallMember/moneyFlow/' + data.id, {
-                    maxmin: true,
-                });
-            }
-
-            if (layEvent == 'updateReferer') {
-                febs.modal.open( '修改推荐人', 'modules/mallMember/updateReferer/' + data.id, {
-                    btn: ['提交', '取消'],
-                    yes: function (index, layero) {
-                        $('#referer-update').find('#submit').trigger('click');
-                    },
-                    btn2: function () {
-                        layer.closeAll();
-                    }
-                });
-            }
-
         });
+        function frozenWithYes(id) {
+            febs.get(ctx + 'admin/mallMember/frozenWithYes/' + id, null, function () {
+                febs.alert.success('操作成功');
+                $query.click();
+            });
+        }
+        function frozenWithNo(id) {
+            febs.get(ctx + 'admin/mallMember/frozenWithNo/' + id, null, function () {
+                febs.alert.success('操作成功');
+                $query.click();
+            });
+        }
+        function outsideWithYes(id) {
+            febs.get(ctx + 'admin/mallMember/outsideWithYes/' + id, null, function () {
+                febs.alert.success('操作成功');
+                $query.click();
+            });
+        }
+        function outsideWithNo(id) {
+            febs.get(ctx + 'admin/mallMember/outsideWithNo/' + id, null, function () {
+                febs.alert.success('操作成功');
+                $query.click();
+            });
+        }
         function insideWithYes(id) {
             febs.get(ctx + 'admin/mallMember/insideWithYes/' + id, null, function () {
                 febs.alert.success('操作成功');
@@ -248,7 +174,7 @@
         // 查询按钮
         $query.on('click', function () {
             var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
-            tableIns.reload({where: params, page: {curr: currPageGoods}});
+            tableIns.reload({where: params, page: {curr: 1}});
         });
 
         // 刷新按钮
@@ -262,49 +188,23 @@
             tableIns = febs.table.init({
                 elem: $view.find('table'),
                 id: 'userTable',
-                url: ctx + 'admin/mallMember/getMallMemberList',
+                url: ctx + 'admin/mallMember/getFcmMallMemberList',
                 toolbar:"#tableMemberBar",
-                defaultToolbar:[],
                 totalRow: true ,// 开启合计行
                 cols: [[
                     {type: 'checkbox'},
-                    {field: 'phone', title: '账号', minWidth: 150,align:'left',hide:toolbarMallmember},
-                    {field: 'name', title: '名称', minWidth: 100,align:'left', totalRowText: '合计:'},
+                    // {field: 'id', title: 'ID', minWidth: 150,align:'left'},
+                    {field: 'accountLogin', title: '登录账户', minWidth: 150,align:'left', totalRowText: '合计:'},
                     {field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
-                    {field: 'balance', title: '余额', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.balance) }}'},
-                    {field: 'prizeScore', title: '现金积分', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.prizeScore) }}'},
-                    {field: 'star', title: '贡献点', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.star) }}'},
-                    {field: 'totalScore', title: '补贴额度', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.totalScore) }}'},
-                    {field: 'voucherCnt', title: '绿色凭证', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.voucherCnt) }}'},
-                    {field: 'voucherAmount', title: '凭证现金', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.voucherAmount) }}'},
                     {field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
-                    {field: 'levelName', title: '会员类型', minWidth: 100,align:'left'},
-                    {field: 'storeMaster', title: '线下服务中心', templet:'#switchStoreMaster', minWidth: 120,align:'left'},
-                    {field: 'director', title: '代理商', templet:'#switchDirector', minWidth: 120,align:'left' },
-                    {field: 'creater', title: '联创', templet:'#switchCreate', minWidth: 120,align:'left' },
-                    {field: 'partner', title: '合伙人', templet:'#switchPartner', minWidth: 120,align:'left' },
-                    {field: 'insideWith', title: '是否内转', templet:'#switchInsideWith', minWidth: 120,align:'left' },
-                    {field: 'accountType', title: '账号类型',
-                        templet: function (d) {
-                            if (d.accountType === 2) {
-                                return '<span style="color:red;">测试账号</span>'
-                            } else if (d.accountType === 1) {
-                                return '<span style="color:green;">正常账号</span>'
-                            }else{
-                                return ''
-                            }
-                        }, minWidth: 100,align:'left'},
-                    {field: 'accountStatus', title: '账号状态', templet: '#switchStatus', minWidth: 100,align:'left'},
+                    {field: 'balance', title: '余额', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.balance) }}'},
+                    {field: 'chargeAmount', title: '充值', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.chargeAmount) }}'},
+                    {field: 'withDrawAmount', title: '提现', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.withDrawAmount) }}'},
+                    {field: 'amountPerk', title: '总盈亏', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.amountPerk) }}'},
+                    {field: 'partner', title: '代理', templet:'#switchPartner', minWidth: 120,align:'left' ,hide:toolbarMallmember},
+                    {field: 'isFrozen', title: '是否冻结', templet:'#switchFrozenWith', minWidth: 120,align:'left' ,hide:toolbarMallmember},
+                    {field: 'accountStatus', title: '账号状态', templet: '#switchStatus', minWidth: 100,align:'left',hide:toolbarMallmember},
                     {field: 'createdTime', title: '注册时间', minWidth: 180,align:'left'},
-                    // {title: '操作',
-                    //     templet: function (d) {
-                    //     // '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="see" shiro:hasPermission="user:update">详情</button>'
-                    //         return '<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="moneyFlow:update" lay-event="moneyFlow">资金流水</button>'
-                    //         + '<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="user:update" lay-event="updateReferer">修改推荐人</button>'
-                    //         // '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="moneyFlow" shiro:hasPermission="moneyFlow:update">资金流水</button>'
-                    //         //  + '<button class="layui-btn layui-btn-normal layui-btn-xs" type="button" lay-event="updateReferer" shiro:hasPermission="user:update">修改推荐人</button>'
-                    //     },minWidth: 200,align:'center', fixed:"right"}
-                    {title: '操作', minWidth: 200 ,toolbar: '#mallmember-option',hide:toolbarMallmember,align:'left', fixed:'right'}
                 ]]
             });
         }
@@ -313,25 +213,9 @@
             var data = obj.data,
                 layEvent = obj.event;
 
-            if (layEvent === 'registMember') {
-                febs.modal.open( '添加会员', 'modules/mallMember/addMember', {
-                    btn: ['提交', '取消'],
-                    yes: function (index, layero) {
-                        $('#member-add').find('#submit').trigger('click');
-                    },
-                    btn2: function () {
-                        layer.closeAll();
-                    }
-                });
-
-                return;
+            if (layEvent === 'exportMember') {
+                window.location.href = ctx + "admin/mallMember/exportMember";
             }
-
-            // var checkData = table.checkStatus('userTable').data;
-            // if (checkData.length <= 0) {
-            //     febs.alert.warn('请选择需要的用户');
-            //     return;
-            // }
 
             if (layEvent === 'resetPwd') {
                 var checkData = table.checkStatus('userTable').data;
@@ -348,22 +232,6 @@
                 });
             }
 
-            if (layEvent === 'resetPayPwd') {
-                var checkData = table.checkStatus('userTable').data;
-                if (checkData.length <= 0) {
-                    febs.alert.warn('请选择需要的用户');
-                    return;
-                }
-                febs.modal.confirm('重置交易密码', '是否重置选中账号交易密码为【123456】?', function () {
-                    var ids = [];
-                    layui.each(checkData, function (key, item) {
-                        ids.push(item.id)
-                    });
-
-                    resetPwd(ids.join(','), 1);
-                });
-            }
-
             if (layEvent === 'balance') {
                 var checkData = table.checkStatus('userTable').data;
                 if (checkData.length <= 0) {
@@ -371,87 +239,15 @@
                     return;
                 }
                 if (checkData.length > 1) {
-                    febs.alert.warn('请选择一个用户');
+                    febs.alert.warn('只能选择一个用户');
                     return;
                 }
-                systemPay("修改余额", checkData[0].id, 1);
-            }
-
-            if (layEvent === 'voucherUpdate') {
-                var checkData = table.checkStatus('userTable').data;
-                if (checkData.length <= 0) {
-                    febs.alert.warn('请选择需要的用户');
-                    return;
-                }
-                if (checkData.length > 1) {
-                    febs.alert.warn('请选择一个用户');
-                    return;
-                }
-                voucherUpdate("拨付绿色凭证", checkData[0].id, 1);
-            }
-
-            if (layEvent === 'score') {
-                var checkData = table.checkStatus('userTable').data;
-                if (checkData.length <= 0) {
-                    febs.alert.warn('请选择需要的用户');
-                    return;
-                }
-                if (checkData.length > 1) {
-                    febs.alert.warn('请选择一个用户');
-                    return;
-                }
-                systemPay("修改赠送积分", checkData[0].id, 2);
-            }
-
-            if (layEvent === 'prizeScore') {
-                var checkData = table.checkStatus('userTable').data;
-                if (checkData.length <= 0) {
-                    febs.alert.warn('请选择需要的用户');
-                    return;
-                }
-                if (checkData.length > 1) {
-                    febs.alert.warn('请选择一个用户');
-                    return;
-                }
-                systemPay("修改竞猜积分", checkData[0].id, 3);
-            }
-
-            if (layEvent === 'agentLevel') {
-                var checkData = table.checkStatus('userTable').data;
-                if (checkData.length <= 0) {
-                    febs.alert.warn('请选择需要的用户');
-                    return;
-                }
-                if (checkData.length > 1) {
-                    febs.alert.warn('请选择一个用户');
-                    return;
-                }
-                febs.modal.open('设置代理级别', 'modules/mallMember/agentLevelSet/' + checkData[0].id, {
-                    btn: ['确认', '取消'],
-                    yes: function (index, layero) {
-                        $('#agent-level-set').find('#submit').trigger('click');
-                    },
-                    btn2: function () {
-                        layer.closeAll();
-                    }
-                });
+                systemPay("葫芦", checkData[0].id, 1);
             }
         });
 
-        function voucherUpdate(text, id, type) {
-            febs.modal.open(text, 'modules/mallMember/voucherUpdate/' + type +'/'+ id, {
-                btn: ['提交', '取消'],
-                yes: function (index, layero) {
-                    $('#voucher-update').find('#submit').trigger('click');
-                },
-                btn2: function () {
-                    layer.closeAll();
-                }
-            });
-        }
-
         function systemPay(text, id, type) {
-            febs.modal.open('text', 'modules/mallMember/mallSystemPay/' + type +'/'+ id, {
+            febs.modal.open(text, 'modules/mallMember/mallSystemPay/' + type +'/'+ id, {
                 btn: ['提交', '取消'],
                 yes: function (index, layero) {
                     $('#systemPay-update').find('#submit').trigger('click');
@@ -465,18 +261,15 @@
         // 获取查询参数
         function getQueryParams() {
             return {
-                name: $searchForm.find('input[name="name"]').val().trim(),
-                account: $searchForm.find('input[name="account"]').val().trim(),
-                accountStatus: $searchForm.find("select[name='accountStatus']").val(),
-                level: $searchForm.find("select[name='level']").val(),
+                accountLogin: $searchForm.find('input[name="accountLogin"]').val().trim(),
             };
         }
 
-        form.on('switch(switchInsideWith)', function (data) {
+        form.on('switch(switchFrozenWith)', function (data) {
             if (data.elem.checked) {
-                insideWithYes(data.value);
+                frozenWithYes(data.value);
             } else {
-                insideWithNo(data.value);
+                frozenWithNo(data.value);
             }
         })
 
@@ -488,30 +281,6 @@
             }
         })
 
-        form.on('switch(switchStoreMaster)', function (data) {
-            if (data.elem.checked) {
-                changeIdentityYes(2, data.value);
-            } else {
-                changeIdentityNo(2, data.value);
-            }
-        })
-
-        form.on('switch(switchDirector)', function (data) {
-            if (data.elem.checked) {
-                changeIdentityYes(1, data.value);
-            } else {
-                changeIdentityNo(1, data.value);
-            }
-        })
-
-        form.on('switch(switchCreate)', function (data) {
-            if (data.elem.checked) {
-                changeIdentityYes(3, data.value);
-            } else {
-                changeIdentityNo(3, data.value);
-            }
-        })
-
         form.on('switch(switchPartner)', function (data) {
             if (data.elem.checked) {
                 changeIdentityYes(4, data.value);
@@ -519,5 +288,6 @@
                 changeIdentityNo(4, data.value);
             }
         })
+
     })
 </script>
\ No newline at end of file

--
Gitblit v1.9.1