From 099093dcafbe53dee99fcefa36a8840fa3d2688a Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sat, 04 Jan 2025 10:20:53 +0800
Subject: [PATCH] fix(mall): 修复会员权益收益计算逻辑
---
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 219 +++++++++++++-----------------------------------------
1 files changed, 53 insertions(+), 166 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 86fb5e5..4659eb4 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -8,12 +8,6 @@
<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">
- </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">
@@ -22,18 +16,19 @@
<div class="layui-inline">
<label class="layui-form-label layui-form-label-sm">会员类型</label>
<div class="layui-input-inline">
- <select name="level">
+ <select name="levelType" class="vip-level-set-level-member">
<option value="">请选择</option>
- <option value="ZERO_LEVEL">普通用户</option>
- <option value="FIRST_LEVEL">城市合伙人</option>
</select>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">会员生日</label>
+ <label class="layui-form-label layui-form-label-sm">节点</label>
<div class="layui-input-inline">
- <input type="text" name="birthday" id="febs-member-benefits-list-birthday-start" lay-verify="date"
- placeholder="MM-dd" autocomplete="off" class="layui-input">
+ <select name="directorState">
+ <option value="">请选择</option>
+ <option value="1">是</option>
+ <option value="0">否</option>
+ </select>
</div>
</div>
</div>
@@ -104,9 +99,12 @@
</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="updateReferer">修改推荐人</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>
+ <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>
- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="addCoupon">优惠券派送</button>
</div>
</script>
<!-- 表格操作栏 end -->
@@ -130,6 +128,19 @@
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();
+ });
});
// 表格初始化
@@ -156,51 +167,6 @@
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 === 'agentSelect') {
- febs.modal.open('推销员设置', 'modules/mallMember/agentSelect/' + data.id, {
- btn: ['提交', '取消'],
- yes: function (index, layero) {
- $('#agent-select').find('#submit').trigger('click');
- },
- btn2: function () {
- layer.closeAll();
- }
- });
- }
-
- if (layEvent === 'moneyFlow') {
- febs.modal.open( '用户资金流水', 'modules/mallMember/moneyFlow/' + data.id, {
- maxmin: true,
- });
- }
-
-
-
});
function memberOut(id) {
febs.get(ctx + 'admin/mallMember/memberOut/' + id, null, function () {
@@ -210,33 +176,33 @@
}
function closeAccount(id) {
febs.get(ctx + 'admin/mallMember/closeAccount/' + id, null, function () {
- febs.alert.success('禁用成功');
+ febs.alert.success('操作成功');
$query.click();
});
}
function openAccount(id) {
febs.get(ctx + 'admin/mallMember/openAccount/' + id, null, function () {
- febs.alert.success('开启成功');
+ febs.alert.success('操作成功');
$query.click();
});
}
function changeIdentityYes(type, id) {
febs.get(ctx + 'admin/mallMember/changeIdentityYes/' + type + "/" + id, null, function () {
- febs.alert.success('设置成功');
+ febs.alert.success('操作成功');
$query.click();
});
}
function changeIdentityNo(type, id) {
febs.get(ctx + 'admin/mallMember/changeIdentityNo/' + type + "/" + id, null, function () {
- febs.alert.success('设置成功');
+ febs.alert.success('操作成功');
$query.click();
});
}
function resetPwd(id, type) {
febs.post(ctx + 'admin/mallMember/resetPwdNew/' + type + "/"+ id, null, function () {
- febs.alert.success('重置成功');
+ febs.alert.success('操作成功');
$query.click();
});
}
@@ -282,51 +248,29 @@
url: ctx + 'admin/mallMember/getMallMemberList',
toolbar:"#toolbar",
defaultToolbar:[],
+ totalRow : true,
cols: [[
{type: 'checkbox'},
- {field: 'phone', title: '手机号码', minWidth: 150,align:'left'},
- {field: 'name', title: '用户昵称', minWidth: 100,align:'left'},
- {field: 'birthday', title: '会员生日', minWidth: 100,align:'left'},
+ {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: 'commission', title: 'USDT', minWidth: 100,align:'left', totalRow:true},
+ {field: 'balance', title: '碳币', minWidth: 100,align:'left', totalRow:true},
+ {field: 'score', title: '碳积分', minWidth: 100,align:'left', totalRow:true},
+ {field: 'directCnt', title: '直推', minWidth: 100,align:'left', totalRow:true},
+ {field: 'teamCnt', title: '团队', minWidth: 100,align:'left', totalRow:true},
+ {field: 'achieveCnt', title: '业绩', minWidth: 100,align:'left', totalRow:true},
{field: 'referrerName', 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},
- // {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 if (d.leaderState === 4) {
- // return '<span">普通用户(取消团长资格)</span>'
- // }else{
- // return '<span">普通用户</span>'
- // }
- // }, minWidth: 100,align:'center'},
- // {field: 'accountStatus', title: '账号状态', templet: '#switchStatus', minWidth: 100,align:'center'},
+ {field: 'director', title: '节点', templet: '#switchDirector', minWidth: 100,align:'center'},
+ {field: 'directorTime', title: '节点时间', minWidth: 180,align:'center'},
+ // {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) {
return ''
+'<button class="layui-btn layui-btn-normal layui-btn-xs febs-bg-red" lay-event="memberOut" 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'}
]]
});
@@ -356,22 +300,6 @@
return;
}
- if (layEvent == 'updateReferer') {
- if (checkData.length > 1) {
- febs.alert.warn('每次只能修改一个用户');
- return;
- }
- febs.modal.open( '修改推荐人', 'modules/mallMember/updateReferer/' + checkData[0].id, {
- btn: ['提交', '取消'],
- yes: function (index, layero) {
- $('#referer-update').find('#submit').trigger('click');
- },
- btn2: function () {
- layer.closeAll();
- }
- });
- }
-
if (layEvent === 'updateVipLevel') {
var checkData = table.checkStatus('userTable').data;
if (checkData.length > 1) {
@@ -394,7 +322,7 @@
}
if (layEvent === 'resetPwd') {
- febs.modal.confirm('重置登录密码', '是否重置选中账号登录密码？', function () {
+ febs.modal.confirm('重置登录密码', '是否重置选中账号登录密码为：【a123456】？', function () {
var ids = [];
layui.each(checkData, function (key, item) {
ids.push(item.id)
@@ -404,7 +332,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)
@@ -418,50 +346,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();
- }
- });
- }
-
- if (layEvent === 'addCoupon') {
- febs.modal.open('添加优惠券', 'modules/mallMember/addCoupon/' + checkData[0].id, {
- btn: ['确认', '取消'],
- yes: function (index, layero) {
- $('#member-coupon-select').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');
@@ -475,11 +372,9 @@
// 获取查询参数
function getQueryParams() {
return {
- name: $searchForm.find('input[name="name"]').val().trim(),
- account: $searchForm.find('input[name="account"]').val().trim(),
- level: $searchForm.find("select[name='level']").val(),
- birthdayQuery: $searchForm.find("input[name='birthday']").val(),
- // level: $searchForm.find("select[name='level']").val(),
+ account: $searchForm.find('input[name="account"]').val(),
+ level: $searchForm.find("select[name='levelType']").val(),
+ director: $searchForm.find("select[name='directorState']").val(),
};
}
@@ -491,19 +386,11 @@
}
})
- 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);
+ changeIdentityYes(1,data.value);
} else {
- changeIdentityNo(1, data.value);
+ changeIdentityNo(1,data.value);
}
})
})
--
Gitblit v1.9.1