From 19c3da86d8c6adcb91baccac6981c63307e3dba1 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 20 Dec 2024 13:01:12 +0800
Subject: [PATCH] fix(mall): 修复会员提现状态更新逻辑
---
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 283 ++++++++++++++++++++++++--------------------------------
1 files changed, 121 insertions(+), 162 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 643a214..438caed 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -8,38 +8,19 @@
<div class="layui-col-md10">
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label layui-form-label-sm">手机号码</label>
<div class="layui-input-inline">
- <input type="text" placeholder="用户名" name="name" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="手机号码" name="account" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label layui-form-label-sm">会员类型</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 layui-form-label-sm">账户状态</label>
- <div class="layui-input-inline">
- <select name="accountStatus">
+ <select name="levelType" class="vip-level-set-level-member">
<option value="">请选择</option>
- <option value="1">正常</option>
- <option value="2">禁用</option>
</select>
</div>
</div>
-<!-- <div class="layui-inline">-->
-<!-- <label class="layui-form-label layui-form-label-sm">会员类型</label>-->
-<!-- <div class="layui-input-inline">-->
-<!-- <select name="level">-->
-<!-- <option value="">请选择</option>-->
-<!-- <option value="FIRST_LEVEL">普通会员</option>-->
-<!-- <option value="SECOND_LEVEL">一星</option>-->
-<!-- <option value="THIRD_LEVEL">二星</option>-->
-<!-- <option value="FOUR_LEVEL">三星</option>-->
-<!-- <option value="FIFTH_LEVEL">四星</option>-->
-<!-- </select>-->
-<!-- </div>-->
-<!-- </div>-->
</div>
</div>
<div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
@@ -53,6 +34,12 @@
</div>
</form>
<table lay-filter="userTable" lay-data="{id: 'userTable'}"></table>
+ <style type="text/css">
+ ::-webkit-scrollbar {
+ height: 20px !important;
+ background-color: #f4f4f4;
+ }
+ </style>
</div>
</div>
</div>
@@ -87,26 +74,32 @@
<input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="switchDirector">
{{# } }}
</script>
+
+<script type="text/html" id="isSalesmanSwitch">
+ {{# if(d.isSale === 1) { }}
+ <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="isSalesmanSwitch">
+ {{# } else { }}
+ <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="isSalesmanSwitch">
+ {{# } }}
+</script>
<style>
.layui-form-onswitch {
background-color: #5FB878 !important;
}
</style>
-<!--<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="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>-->
-<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="prizeScore">拨付竞猜积分</button>-->
-<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="resetPwd">重置登录密码</button>-->
-<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="resetPayPwd">重置支付密码</button>-->
-<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="agentLevel">设置代理等级</button>-->
-<!-- </div>-->
-<!--</script>-->
+<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="balance">碳币拨付</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="score">碳积分拨付</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="resetPwd">登录密码重置</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="resetPayPwd">资金密码重置</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="updateVipLevel">修改会员等级</button>
+ </div>
+</script>
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
// 引入组件并初始化
- layui.use([ 'jquery', 'form', 'table', 'febs'], function () {
+ layui.use([ 'jquery', 'form', 'table', 'febs', 'laydate'], function () {
var $ = layui.jquery,
febs = layui.febs,
form = layui.form,
@@ -116,9 +109,28 @@
$reset = $view.find('#reset'),
$searchForm = $view.find('form'),
sortObject = {field: 'phone', type: null},
+ laydate = layui.laydate,
tableIns;
form.render();
+
+ laydate.render({
+ elem: '#febs-member-benefits-list-birthday-start',
+ format:'MM-dd'
+ });
+
+ //(下拉框)
+ $.get(ctx + 'admin/runVip/allVipList', function (res) {
+ var data = res.data;
+ for (var k in data)
+ {
+ $(".vip-level-set-level-member").append("<option value='" + data[k].vipCode + "'>" + data[k].vipName + "</option>");
+ }
+ layui.use('form', function () {
+ var form = layui.form;
+ form.render();
+ });
+ });
// 表格初始化
initTable();
@@ -127,6 +139,12 @@
table.on('tool(userTable)', function (obj) {
var data = obj.data,
layEvent = obj.event;
+
+ if (layEvent === 'memberOut') {
+ febs.modal.confirm('注销', '确认注销该账号？', function () {
+ memberOut(data.id);
+ });
+ }
if (layEvent === 'close') {
febs.modal.confirm('禁用', '确认禁用该账号？', function () {
@@ -138,49 +156,13 @@
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 === 'addLeader') {
- febs.modal.open( '团长新增', 'modules/leader/addLeader/' + data.id, {
- btn: ['提交', '取消'],
- yes: function (index, layero) {
- $('#user-addLeader').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 memberOut(id) {
+ febs.get(ctx + 'admin/mallMember/memberOut/' + id, null, function () {
+ febs.alert.success('操作成功');
+ $query.click();
+ });
+ }
function closeAccount(id) {
febs.get(ctx + 'admin/mallMember/closeAccount/' + id, null, function () {
febs.alert.success('禁用成功');
@@ -214,6 +196,26 @@
});
}
+ form.on('switch(isSalesmanSwitch)', function (data) {
+ if (data.elem.checked) {
+ upSale(data.value);
+ } else {
+ downSale(data.value);
+ }
+ })
+
+ function upSale(id) {
+ febs.get(ctx + 'admin/mallMember/upSale/' + id, null, function () {
+ febs.alert.success('操作成功');
+ $query.click();
+ });
+ }
+ function downSale(id) {
+ febs.get(ctx + 'admin/mallMember/downSale/' + id, null, function () {
+ febs.alert.success('操作成功');
+ $query.click();
+ });
+ }
// 查询按钮
$query.on('click', function () {
@@ -233,53 +235,26 @@
elem: $view.find('table'),
id: 'userTable',
url: ctx + 'admin/mallMember/getMallMemberList',
- // toolbar:"#toolbar",
+ toolbar:"#toolbar",
defaultToolbar:[],
+ totalRow : true,
cols: [[
- // {type: 'checkbox'},
- {field: 'phone', title: '账号', minWidth: 150,align:'left'},
- {field: 'name', title: '名称', minWidth: 100,align:'left'},
+ {type: 'checkbox'},
+ {field: 'phone', title: '账号', minWidth: 150,align:'left',totalRowText:"合计"},
+ {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: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
- // {field: 'levelName', title: '会员类型', minWidth: 100,align:'left'},
- // {field: 'storeMaster', title: '店长', templet:'#switchStoreMaster', minWidth: 100},
- // {field: 'director', title: '总监', templet:'#switchDirector', minWidth: 100},
- {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:'center'},
- {field: 'leaderState', title: '是否是团长',
- templet: function (d) {
- if (d.leaderState === 1) {
- return '<span style="color:green;">团长</span>'
- }else if (d.leaderState === 3) {
- return '<span">申请中</span>'
- }else{
- return '<span">普通用户</span>'
- }
- }, minWidth: 100,align:'center'},
- // {field: 'accountStatus', title: '账号状态', templet: '#switchStatus', minWidth: 100,align:'center'},
+ {field: 'balance', title: '碳币', minWidth: 100,align:'left', totalRow:true},
+ {field: 'score', title: '碳积分', minWidth: 100,align:'left', totalRow:true},
+ {field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
+ {field: 'levelName', title: '会员等级', minWidth: 100,align:'left'},
+ {field: 'vipLevelTime', title: '到期时间', minWidth: 180,align:'center'},
{field: 'createdTime', title: '注册时间', minWidth: 180,align:'center'},
+ {field: 'accountStatus', title: '账号状态', templet: '#switchStatus', minWidth: 100,align:'center'},
{title: '操作',
templet: function (d) {
- if(d.leaderState === 1 || d.leaderState === 3){
- return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="moneyFlow" shiro:hasPermission="user:update">资金流水</button>'
- }else{
- return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="moneyFlow" shiro:hasPermission="user:update">资金流水</button>'
- + '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="addLeader" shiro:hasPermission="user:update">设置为团长</button>'
- }
-
- },minWidth: 200,align:'center', fixed:"right"}
+ return ''
+ +'<button class="layui-btn layui-btn-normal layui-btn-xs febs-bg-red" lay-event="memberOut" shiro:hasPermission="user:update">注销</button>'
+ },minWidth: 200,align:'center'}
]]
});
}
@@ -308,8 +283,29 @@
return;
}
+ 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 () {
+ febs.modal.confirm('重置登录密码', '是否重置选中账号登录密码为：【a123456】？', function () {
var ids = [];
layui.each(checkData, function (key, item) {
ids.push(item.id)
@@ -319,7 +315,7 @@
}
if (layEvent === 'resetPayPwd') {
- febs.modal.confirm('重置交易密码', '是否重置选中账号交易密码？', function () {
+ febs.modal.confirm('重置交易密码', '是否重置选中账号交易密码为：【123456】？', function () {
var ids = [];
layui.each(checkData, function (key, item) {
ids.push(item.id)
@@ -333,38 +329,19 @@
if (checkData.length > 1) {
febs.alert.warn('请选择一个用户');
}
- systemPay("修改余额", checkData[0].id, 1);
+ systemPay("碳币拨付", checkData[0].id, 1);
}
if (layEvent === 'score') {
if (checkData.length > 1) {
febs.alert.warn('请选择一个用户');
}
- systemPay("修改赠送积分", checkData[0].id, 2);
- }
-
- if (layEvent === 'prizeScore') {
- if (checkData.length > 1) {
- febs.alert.warn('请选择一个用户');
- }
- systemPay("修改竞猜积分", checkData[0].id, 3);
- }
-
- if (layEvent === 'agentLevel') {
- 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, 2);
}
});
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');
@@ -378,10 +355,8 @@
// 获取查询参数
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(),
+ account: $searchForm.find('input[name="account"]').val(),
+ level: $searchForm.find("select[name='levelType']").val(),
};
}
@@ -390,22 +365,6 @@
openAccount(data.value);
} else {
closeAccount(data.value);
- }
- })
-
- 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);
}
})
})
--
Gitblit v1.9.1