From 42ef73cb6412aed7e21f7a4507a0667540add2b3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 10 Mar 2023 22:25:22 +0800
Subject: [PATCH] 后端页面
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java | 2 +
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 2 +
src/main/resources/mapper/modules/DataDictionaryCustomMapper.xml | 2
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 69 ++++++++++++++++++++--------------
4 files changed, 45 insertions(+), 30 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
index a2cc7c2..a683d78 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -12,6 +12,7 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -96,6 +97,7 @@
* 会员列表-资金流水
*/
@GetMapping("/moneyFlow")
+ @RequiresPermissions("moneyFlow:update")
public FebsResponse moneyFlow(QueryRequest request, MallMember mallMember, Integer parentId) {
if (parentId == null) {
ViewMallMemberController.idFromMoneyFlow = 0;
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
index e62484f..aa8055e 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -94,6 +94,7 @@
* @return
*/
@GetMapping("moneyFlow/{id}")
+ @RequiresPermissions("moneyFlow:update")
public String moneyFlow(@PathVariable long id, Model model) {
idFromMoneyFlow = id;
return FebsUtil.view("modules/mallMember/moneyFlow");
@@ -288,6 +289,7 @@
}
@GetMapping("updateReferer/{id}")
+ @RequiresPermissions("updateReferer:update")
public String updateReferer(@PathVariable("id") Long id, Model model) {
MallMember member = mallMemberService.getById(id);
model.addAttribute("referer", mallMemberService.findByInviteId(member.getReferrerId()));
diff --git a/src/main/resources/mapper/modules/DataDictionaryCustomMapper.xml b/src/main/resources/mapper/modules/DataDictionaryCustomMapper.xml
index ac88217..69c0f97 100644
--- a/src/main/resources/mapper/modules/DataDictionaryCustomMapper.xml
+++ b/src/main/resources/mapper/modules/DataDictionaryCustomMapper.xml
@@ -32,7 +32,7 @@
<select id="getAgentLevelOption" resultType="cc.mrbird.febs.mall.vo.AdminAgentLevelOptionTreeVo">
select a.code id,a.description name from data_dictionary_custom a
- where a.type='AGENT_LEVEL' and a.code != 'ZERO_LEVEL'
+ where a.type='AGENT_LEVEL_REQUIRE'
</select>
<select id="getRankAwardUpdateInfoById" resultType="cc.mrbird.febs.mall.vo.AdminRankAwardUpdateInfoVo">
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 2dad877..bb88e32 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -8,13 +8,15 @@
<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="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">
+ <input type="text" placeholder="账号/邀请码" name="account" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
@@ -32,11 +34,13 @@
<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>
+ <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>
</div>
</div>
@@ -58,13 +62,14 @@
</div>
</div>
</div>
+
<!-- 表格操作栏 start -->
-<script type="text/html" id="user-option">
- <span shiro:lacksPermission="user:view,user:update,user:delete">
- <span class="layui-badge-dot febs-bg-orange"></span> 无权限
- </span>
- <a lay-event="edit" shiro:hasPermission="user:update"><i
- class="layui-icon febs-edit-area febs-blue"></i></a>
+<script type="text/html" id="mallmember-option">
+<!-- <span shiro:lacksPermission="moneyFlow:update">-->
+<!-- <span class="layui-badge-dot febs-bg-orange"></span>-->
+<!-- </span>-->
+ <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="updateReferer:update" lay-event="updateReferer">修改推荐人</button>
</script>
<script type="text/html" id="switchStatus">
{{# if(d.accountStatus === 1) { }}
@@ -94,13 +99,13 @@
</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>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="moneyFlow:update" lay-event="registMember">添加会员</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="moneyFlow:update" lay-event="balance">拨付余额</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="moneyFlow:update" lay-event="score">拨付赠送积分</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="moneyFlow:update" lay-event="prizeScore">拨付折扣积分</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="moneyFlow:update" lay-event="resetPwd">重置登录密码</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="moneyFlow:update" lay-event="resetPayPwd">重置支付密码</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="moneyFlow:update" lay-event="agentLevel">设置代理等级</button>
</div>
</script>
<!-- 表格操作栏 end -->
@@ -119,6 +124,9 @@
tableIns;
form.render();
+ let currPageGoods = 1;//首先默认值为1，防止出错
+ //获取当前页
+ currPageGoods = $view.find(".layui-laypage-em").next().html();
// 表格初始化
initTable();
@@ -206,14 +214,14 @@
// 查询按钮
$query.on('click', function () {
var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
- tableIns.reload({where: params, page: {curr: 1}});
+ tableIns.reload({where: params, page: {curr: currPageGoods}});
});
// 刷新按钮
$reset.on('click', function () {
$searchForm[0].reset();
sortObject.type = 'null';
- tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
+ tableIns.reload({where: getQueryParams(), page: {curr: currPageGoods}, initSort: sortObject});
});
function initTable() {
@@ -235,7 +243,7 @@
{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: 'director', title: '总监', templet:'#switchDirector', minWidth: 100 ,hide:true},
{field: 'accountType', title: '账号类型',
templet: function (d) {
if (d.accountType === 2) {
@@ -248,12 +256,15 @@
}, minWidth: 100,align:'center'},
{field: 'accountStatus', title: '账号状态', templet: '#switchStatus', minWidth: 100,align:'center'},
{field: 'createdTime', title: '注册时间', minWidth: 180,align:'center'},
- {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-xs" lay-event="moneyFlow" shiro:hasPermission="user:update">资金流水</button>'
- + '<button class="layui-btn layui-btn-normal layui-btn-xs" type="button" lay-event="updateReferer">修改推荐人</button>'
- },minWidth: 200,align:'center', fixed:"right"}
+ // {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'}
]]
});
}
--
Gitblit v1.9.1