From df864d1d636751424fd642d3bdd33c53cf63500d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 07 Jul 2025 17:51:09 +0800
Subject: [PATCH] feat(mall): 为活动订单项添加积分和成长值奖 - 在活动添加和编辑页面增加积分和成长值输入字段 - 更新活动实体类，添加 scoreCnt 和 growthCnt 字段 - 修改活动订单项处理逻辑，增加积分和成长值奖励的计算和发放 - 优化活动订单项状态检查逻辑，移除冗余代码
---
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 69 +++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 18 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 4890e74..458e70f 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -1,4 +1,4 @@
-<div class="layui-fluid layui-anim febs-anim" id="febs-member-list" lay-title="会员列表">
+<div class="layui-fluid layui-anim febs-anim" id="febs-member-list" lay-title="用户列表">
<div class="layui-row febs-container">
<div class="layui-col-md12">
<div class="layui-card">
@@ -127,6 +127,14 @@
{{# } }}
</script>
+<script type="text/html" id="checkLeaderSwitch">
+ {{# if(d.checkLeader === 1) { }}
+ <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="checkLeaderSwitch">
+ {{# } else { }}
+ <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="checkLeaderSwitch">
+ {{# } }}
+</script>
+
<script type="text/html" id="isDoctorSwitch">
{{# if(d.doctorState === 1) { }}
<input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="isDoctorSwitch">
@@ -144,6 +152,9 @@
<!-- <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" shiro:hasPermission="updateMemberLevel:update" lay-event="updateMemberLevel">修改会员等级</button>
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="updateSaleLevel:update" lay-event="updateSaleLevel">修改分销等级</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="wallet:update" lay-event="balance">余额修改</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="wallet:update" lay-event="prizeScore">积分修改</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="wallet:update" lay-event="commission">佣金修改</button>
<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="addCoupon">优惠券派送</button>-->
</div>
</script>
@@ -315,6 +326,14 @@
}
})
+ form.on('switch(checkLeaderSwitch)', function (data) {
+ if (data.elem.checked) {
+ checkLeader(data.value);
+ } else {
+ checkLeader(data.value);
+ }
+ })
+
form.on('switch(isSalesmanSwitch)', function (data) {
if (data.elem.checked) {
upSale(data.value);
@@ -340,6 +359,13 @@
function checkOrder(id) {
febs.get(ctx + 'admin/mallMember/checkOrder/' + id, null, function () {
+ febs.alert.success('操作成功');
+ $query.click();
+ });
+ }
+
+ function checkLeader(id) {
+ febs.get(ctx + 'admin/mallMember/checkLeader/' + id, null, function () {
febs.alert.success('操作成功');
$query.click();
});
@@ -381,15 +407,22 @@
cols: [[
{type: 'checkbox'},
{type: 'numbers', title: '', width: 80},
- // {title: '操作', toolbar: '#memberOption', minWidth: 200, align: 'center'},
- {field: 'name', title: '用户名', minWidth: 100,align:'left'},
- {field: 'realName', title: '真实姓名', minWidth: 100,align:'left'},
- {field: 'phone', title: '联系方式', minWidth: 150,align:'left'},
- {field: 'directorName', title: '会员等级', minWidth: 150,align:'left'},
- {field: 'storeMasterName', title: '分销等级', minWidth: 150,align:'left'},
- {field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
{field: 'checkOrder', title: '状态', templet: '#accountStatusSwitch', minWidth: 100,align:'center'},
- {field: 'checkOrder', title: '核销员', templet: '#checkOrderSwitch', minWidth: 100,align:'center'},
+ {field: 'checkOrder', title: '活动核销', templet: '#checkOrderSwitch', minWidth: 100,align:'center'},
+ {field: 'checkLeader', title: '自提核销', templet: '#checkLeaderSwitch', minWidth: 100,align:'center'},
+ {field: 'isSalesman', title: '推销员设置', templet: '#isSalesmanSwitch', minWidth: 100,align:'center'},
+ // {title: '操作', toolbar: '#memberOption', minWidth: 200, align: 'center'},
+ {field: 'name', title: '用户名', minWidth: 100,align:'center'},
+ {field: 'realName', title: '真实姓名', minWidth: 100,align:'center'},
+ {field: 'phone', title: '联系方式', minWidth: 150,align:'center'},
+ {field: 'balance', title: '余额', minWidth: 150,align:'center'},
+ {field: 'score', title: '会员经验', minWidth: 150,align:'center'},
+ {field: 'prizeScore', title: '积分', minWidth: 150,align:'center'},
+ {field: 'commission', title: '可用佣金', minWidth: 150,align:'center'},
+ {field: 'totalScore', title: '总佣金', minWidth: 150,align:'center'},
+ {field: 'directorName', title: '会员等级', minWidth: 150,align:'center'},
+ {field: 'storeMasterName', title: '分销等级', minWidth: 150,align:'center'},
+ {field: 'inviteId', title: '邀请码', minWidth: 100,align:'center'},
{field: 'createdTime', title: '注册时间', minWidth: 180,align:'center'},
]]
});
@@ -494,21 +527,21 @@
if (checkData.length > 1) {
febs.alert.warn('请选择一个用户');
}
- systemPay("修改余额", checkData[0].id, 1);
- }
-
- if (layEvent === 'score') {
- if (checkData.length > 1) {
- febs.alert.warn('请选择一个用户');
- }
- systemPay("修改赠送积分", checkData[0].id, 2);
+ systemPay("余额", checkData[0].id, 1);
}
if (layEvent === 'prizeScore') {
if (checkData.length > 1) {
febs.alert.warn('请选择一个用户');
}
- systemPay("修改竞猜积分", checkData[0].id, 3);
+ systemPay("积分", checkData[0].id, 2);
+ }
+
+ if (layEvent === 'commission') {
+ if (checkData.length > 1) {
+ febs.alert.warn('请选择一个用户');
+ }
+ systemPay("佣金", checkData[0].id, 3);
}
if (layEvent === 'agentLevel') {
--
Gitblit v1.9.1