From f95aed31d0cbffd94550fbe64f457af83c8a23d8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 10 Feb 2023 18:22:32 +0800
Subject: [PATCH] 增加推销员
---
src/main/resources/templates/febs/views/modules/mallMember/mallSalesManList.html | 155 +++++++++++++++++++
src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java | 35 +++
src/main/resources/mapper/modules/MallSalesmanMapper.xml | 12 +
src/main/resources/templates/febs/views/modules/mallMember/salesmanUpdate.html | 76 +++++++++
src/main/java/cc/mrbird/febs/mall/mapper/MallSalesmanMapper.java | 11 +
src/main/resources/templates/febs/views/modules/mallMember/addSalesman.html | 76 +++++++++
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 36 ++++
src/main/java/cc/mrbird/febs/mall/entity/MallSalesman.java | 20 ++
src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java | 8 +
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 34 ++++
10 files changed, 459 insertions(+), 4 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 6be9111..2e446c9 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -394,4 +394,40 @@
return mallMemberService.disagreeAgentApply(id);
}
+ /**
+ * 推销员列表
+ */
+ @GetMapping("salesmanList")
+ public FebsResponse salesmanList(MallSalesman mallSalesman, QueryRequest request) {
+ Map<String, Object> data = getDataTable(mallMemberService.getMallSalesmanListInPage(mallSalesman, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 推销员列表-新增
+ */
+ @PostMapping("addSalesman")
+ @ControllerEndpoint(operation = " 推销员列表-新增", exceptionMessage = "操作失败")
+ public FebsResponse addSalesman(@Valid MallSalesman mallSalesman) {
+ return mallMemberService.addSalesman(mallSalesman);
+ }
+
+ /**
+ * 推销员列表-删除
+ */
+ @GetMapping("salesmanDel/{id}")
+ @ControllerEndpoint(operation = "推销员列表-删除", exceptionMessage = "操作失败")
+ public FebsResponse salesmanDel(@NotNull(message = "{required}") @PathVariable Long id) {
+ return mallMemberService.salesmanDel(id);
+ }
+
+ /**
+ * 推销员列表-更新
+ */
+ @PostMapping("salesmanUpdate")
+ @ControllerEndpoint(operation = "推销员列表-更新", exceptionMessage = "操作失败")
+ public FebsResponse salesmanUpdate(@Valid MallSalesman mallSalesman) {
+ return mallMemberService.salesmanUpdate(mallSalesman);
+ }
+
}
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 4e58c2d..2de3e48 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -3,10 +3,8 @@
import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsConstant;
import cc.mrbird.febs.common.utils.FebsUtil;
-import cc.mrbird.febs.mall.entity.AppVersion;
-import cc.mrbird.febs.mall.entity.MallMember;
-import cc.mrbird.febs.mall.entity.MallNewsInfo;
-import cc.mrbird.febs.mall.entity.MallShopApply;
+import cc.mrbird.febs.mall.entity.*;
+import cc.mrbird.febs.mall.mapper.MallSalesmanMapper;
import cc.mrbird.febs.mall.service.IAdminMallMemberService;
import cc.mrbird.febs.mall.vo.*;
import lombok.RequiredArgsConstructor;
@@ -23,6 +21,8 @@
public class ViewMallMemberController extends BaseController {
private final IAdminMallMemberService mallMemberService;
+
+ private final MallSalesmanMapper mallSalesmanMapper;
public static long idFromMoneyFlow;
@@ -276,7 +276,34 @@
return FebsUtil.view("modules/mallMember/mallAgentRecord");
}
+ /**
+ * 推销员列表
+ */
+ @GetMapping("mallSalesManList")
+ @RequiresPermissions("mallSalesManList:view")
+ public String mallSalesManList() {
+ return FebsUtil.view("modules/mallMember/mallSalesManList");
+ }
+ /**
+ * 推销员列表-新增
+ */
+ @GetMapping("addSalesman")
+ @RequiresPermissions("addSalesman:view")
+ public String addSalesman() {
+ return FebsUtil.view("modules/mallMember/addSalesman");
+ }
+
+ /**
+ * 推销员列表-详情
+ */
+ @GetMapping("salesmanUpdate/{id}")
+ @RequiresPermissions("salesmanUpdate:update")
+ public String salesmanUpdate(@PathVariable long id, Model model) {
+ MallSalesman mallSalesman = mallSalesmanMapper.selectById(id);
+ model.addAttribute("mallSalesman", mallSalesman);
+ return FebsUtil.view("modules/mallMember/salesmanUpdate");
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallSalesman.java b/src/main/java/cc/mrbird/febs/mall/entity/MallSalesman.java
new file mode 100644
index 0000000..46f0290
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallSalesman.java
@@ -0,0 +1,20 @@
+package cc.mrbird.febs.mall.entity;
+
+import cc.mrbird.febs.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 推销员
+ */
+@Data
+@TableName("mall_salesman")
+public class MallSalesman extends BaseEntity {
+
+ private String name;
+
+ private String remark;
+
+ private Integer state;
+
+}
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallSalesmanMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallSalesmanMapper.java
new file mode 100644
index 0000000..97d296f
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallSalesmanMapper.java
@@ -0,0 +1,11 @@
+package cc.mrbird.febs.mall.mapper;
+
+import cc.mrbird.febs.mall.entity.MallSalesman;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+public interface MallSalesmanMapper extends BaseMapper<MallSalesman> {
+
+ IPage<MallSalesman> selectMallSalesmanListInPage(Page<MallSalesman> page, MallSalesman mallSalesman);
+}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java b/src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java
index 200a1c6..182d412 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java
@@ -96,4 +96,12 @@
FebsResponse agreeAgentApply(Long id);
FebsResponse disagreeAgentApply(Long id);
+
+ IPage<MallSalesman> getMallSalesmanListInPage(MallSalesman mallSalesman, QueryRequest request);
+
+ FebsResponse addSalesman(MallSalesman mallSalesman);
+
+ FebsResponse salesmanDel(Long id);
+
+ FebsResponse salesmanUpdate(MallSalesman mallSalesman);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
index e57eb82..d98a241 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
@@ -69,6 +69,7 @@
private final MallTeamLeaderMapper mallTeamLeaderMapper;
private final MallAgentRecordMapper mallAgentRecordMapper;
+ private final MallSalesmanMapper mallSalesmanMapper;
@Override
public IPage<MallMember> getMallMemberList(MallMember mallMember, QueryRequest request) {
@@ -641,6 +642,39 @@
return new FebsResponse().success();
}
+ @Override
+ public IPage<MallSalesman> getMallSalesmanListInPage(MallSalesman mallSalesman, QueryRequest request) {
+ Page<MallSalesman> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return mallSalesmanMapper.selectMallSalesmanListInPage(page, mallSalesman);
+ }
+
+ @Override
+ public FebsResponse addSalesman(MallSalesman mallSalesman) {
+ mallSalesmanMapper.insert(mallSalesman);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public FebsResponse salesmanDel(Long id) {
+ MallSalesman mallSalesman = mallSalesmanMapper.selectById(id);
+ if(ObjectUtil.isEmpty(mallSalesman)){
+ return new FebsResponse().fail().message("推销员不存在");
+ }
+ mallSalesman.setState(2);
+ mallSalesmanMapper.updateById(mallSalesman);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public FebsResponse salesmanUpdate(MallSalesman mallSalesman) {
+ MallSalesman mallSalesmanNow = mallSalesmanMapper.selectById(mallSalesman.getId());
+ if(ObjectUtil.isEmpty(mallSalesmanNow)){
+ return new FebsResponse().fail().message("推销员不存在");
+ }
+ mallSalesmanMapper.updateById(mallSalesman);
+ return new FebsResponse().success();
+ }
+
private String refererIds(String parentId) {
boolean flag = false;
if (StrUtil.isBlank(parentId)) {
diff --git a/src/main/resources/mapper/modules/MallSalesmanMapper.xml b/src/main/resources/mapper/modules/MallSalesmanMapper.xml
new file mode 100644
index 0000000..202cbfc
--- /dev/null
+++ b/src/main/resources/mapper/modules/MallSalesmanMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cc.mrbird.febs.mall.mapper.MallSalesmanMapper">
+
+ <select id="selectMallSalesmanListInPage" resultType="cc.mrbird.febs.mall.entity.MallSalesman">
+ SELECT
+ a.*
+ FROM mall_salesman a
+ GROUP BY a.id order by a.CREATED_TIME desc
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/addSalesman.html b/src/main/resources/templates/febs/views/modules/mallMember/addSalesman.html
new file mode 100644
index 0000000..f3aa517
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/mallMember/addSalesman.html
@@ -0,0 +1,76 @@
+<style>
+ #salesman-add {
+ padding: 20px 25px 25px 0;
+ }
+
+ #salesman-add .layui-treeSelect .ztree li a, .ztree li span {
+ margin: 0 0 2px 3px !important;
+ }
+ #salesman-add #data-permission-tree-block {
+ border: 1px solid #eee;
+ border-radius: 2px;
+ padding: 3px 0;
+ }
+ #salesman-add .layui-treeSelect .ztree li span.button.switch {
+ top: 1px;
+ left: 3px;
+ }
+ #salesman-add img{
+ max-width:100px
+ }
+
+</style>
+<div class="layui-fluid" id="salesman-add">
+ <form class="layui-form" action="" lay-filter="salesman-add-form">
+ <div class="layui-form-item">
+ <div class="layui-col-lg6">
+ <label class="layui-form-label febs-form-item-require">姓名：</label>
+ <div class="layui-input-block">
+ <input type="text" name="name" lay-verify="required" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-col-lg6">
+ <label class="layui-form-label">备注：</label>
+ <div class="layui-input-block">
+ <input type="text" name="remark" autocomplete="off" class="layui-input" >
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item febs-hide">
+ <button class="layui-btn" lay-submit="" lay-filter="salesman-add-form-submit" id="submit"></button>
+ </div>
+ </form>
+</div>
+
+<script data-th-inline="javascript">
+ layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree','dropdown', 'laydate', 'layedit', 'upload', 'element', 'table', 'xmSelect'], function () {
+ var $ = layui.jquery,
+ febs = layui.febs,
+ layer = layui.layer,
+ table = layui.table,
+ formSelects = layui.formSelects,
+ treeSelect = layui.treeSelect,
+ form = layui.form,
+ laydate = layui.laydate,
+ eleTree = layui.eleTree,
+ $view = $('#salesman-add'),
+ layedit = layui.layedit,
+ upload = layui.upload,
+ validate = layui.validate,
+ element = layui.element;
+
+ form.render();
+ formSelects.render();
+
+ form.on('submit(salesman-add-form-submit)', function (data) {
+ febs.post(ctx + 'admin/mallMember/addSalesman', data.field, function () {
+ layer.closeAll();
+ febs.alert.success('操作成功');
+ $('#febs-salesman').find('#reset').click();
+ });
+ return false;
+ });
+ });
+</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/mallSalesManList.html b/src/main/resources/templates/febs/views/modules/mallMember/mallSalesManList.html
new file mode 100644
index 0000000..8016d66
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallSalesManList.html
@@ -0,0 +1,155 @@
+<div class="layui-fluid layui-anim febs-anim" id="febs-salesman" lay-title="推销员管理">
+ <div class="layui-row febs-container">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <div class="layui-card-body febs-table-full">
+ <form class="layui-form layui-table-form" lay-filter="salesman-table-form">
+ <div class="layui-row">
+ <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
+ <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="addSalesman">
+ 新增
+ </div>
+ <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="query">
+ <i class="layui-icon"></i>
+ </div>
+ <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">
+ <i class="layui-icon"></i>
+ </div>
+ </div>
+ </div>
+ </form>
+ <table lay-filter="salesmanTable" lay-data="{id: 'salesmanTable'}"></table>
+ <style type="text/css">
+ .layui-table-cell{
+ text-align:center;
+ height: auto;
+ white-space: nowrap; /*文本不会换行，在同一行显示*/
+ overflow: hidden; /*超出隐藏*/
+ text-overflow: ellipsis; /*省略号显示*/
+ }
+ .layui-table img{
+ max-width:100px
+ }
+ </style>
+ </div>
+ </div>
+ </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>
+<style>
+ .layui-form-onswitch {
+ background-color: #5FB878 !important;
+ }
+</style>
+<!-- 表格操作栏 end -->
+<script data-th-inline="none" type="text/javascript">
+ // 引入组件并初始化
+ layui.use([ 'jquery', 'form', 'table', 'febs'], function () {
+ var $ = layui.jquery,
+ febs = layui.febs,
+ form = layui.form,
+ table = layui.table,
+ $view = $('#febs-salesman'),
+ $query = $view.find('#query'),
+ $reset = $view.find('#reset'),
+ $searchForm = $view.find('form'),
+ $addSalesman = $view.find('#addSalesman'),
+ sortObject = {field: 'phone', type: null},
+ tableIns;
+
+ form.render();
+
+ // 表格初始化
+ initTable();
+
+ // 初始化表格操作栏各个按钮功能
+ table.on('tool(salesmanTable)', function (obj) {
+ var data = obj.data,
+ layEvent = obj.event;
+
+ if (layEvent === 'salesmanDel') {
+ febs.modal.confirm('删除', '确认删除['+data.name+']推荐员？', function () {
+ salesmanDel(data.id);
+ });
+ }
+ if (layEvent === 'salesmanUpdate') {
+ febs.modal.open('编辑', 'modules/mallMember/salesmanUpdate/' + data.id, {
+ btn: ['提交', '取消'],
+ area:['100%','100%'],
+ yes: function (index, layero) {
+ $('#salesman-update').find('#submit').trigger('click');
+ },
+ btn2: function () {
+ layer.closeAll();
+ }
+ });
+ }
+
+ });
+ function salesmanDel(id) {
+ febs.get(ctx + 'admin/mallMember/salesmanDel/' + id, null, function () {
+ febs.alert.success('删除成功');
+ $query.click();
+ });
+ }
+ // 查询按钮
+ $query.on('click', function () {
+ var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
+ tableIns.reload({where: params, page: {curr: 1}});
+ });
+
+ // 刷新按钮
+ $reset.on('click', function () {
+ $searchForm[0].reset();
+ sortObject.type = 'null';
+ tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
+ });
+
+ $addSalesman.on('click', function () {
+ febs.modal.open('新增', 'modules/mallMember/addSalesman/', {
+ btn: ['提交', '取消'],
+ area:['100%','100%'],
+ yes: function (index, layero) {
+ $('#salesman-add').find('#submit').trigger('click');
+ },
+ btn2: function () {
+ layer.closeAll();
+ }
+ });
+ });
+
+ function initTable() {
+ tableIns = febs.table.init({
+ elem: $view.find('table'),
+ id: 'salesmanTable',
+ url: ctx + 'admin/mallMember/salesmanList',
+ cols: [[
+ {field: 'id', title: '序号', minWidth: 100,align:'left'},
+ {field: 'name', title: '姓名', minWidth: 100,align:'left'},
+ {field: 'remark', title: '备注', minWidth: 140,align:'left'},
+ {title: '操作',
+ templet: function (d) {
+ return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="salesmanUpdate" shiro:hasPermission="user:update">编辑</button>'
+ + '<button class="layui-btn layui-btn-normal layui-btn-xs febs-bg-red" lay-event="salesmanDel" shiro:hasPermission="user:update">删除</button>'
+
+ },minWidth: 160,align:'center'}
+ ]]
+ });
+ }
+
+ // 获取查询参数
+ function getQueryParams() {
+ return {
+ };
+ }
+
+ })
+</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/salesmanUpdate.html b/src/main/resources/templates/febs/views/modules/mallMember/salesmanUpdate.html
new file mode 100644
index 0000000..44b17b3
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/mallMember/salesmanUpdate.html
@@ -0,0 +1,76 @@
+<style>
+ #salesman-update {
+ padding: 20px 25px 25px 0;
+ }
+
+ #salesman-update .layui-treeSelect .ztree li a, .ztree li span {
+ margin: 0 0 2px 3px !important;
+ }
+ #salesman-update #data-permission-tree-block {
+ border: 1px solid #eee;
+ border-radius: 2px;
+ padding: 3px 0;
+ }
+ #salesman-update .layui-treeSelect .ztree li span.button.switch {
+ top: 1px;
+ left: 3px;
+ }
+
+</style>
+<div class="layui-fluid" id="salesman-update">
+ <form class="layui-form" action="" lay-filter="salesman-update-form">
+ <div class="layui-form-item febs-hide">
+ <label class="layui-form-label febs-form-item-require">用户id：</label>
+ <div class="layui-input-block">
+ <input type="text" name="id" >
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-col-lg6">
+ <label class="layui-form-label febs-form-item-require">姓名：</label>
+ <div class="layui-input-block">
+ <input type="text" name="name" lay-verify="required" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-col-lg6">
+ <label class="layui-form-label">备注：</label>
+ <div class="layui-input-block">
+ <input type="text" name="remark" autocomplete="off" class="layui-input" >
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item febs-hide">
+ <button class="layui-btn" lay-submit="" lay-filter="salesman-update-form-submit" id="submit"></button>
+ </div>
+ </form>
+</div>
+
+<script data-th-inline="javascript">
+ layui.use(['febs', 'form', 'validate'], function () {
+ var $ = layui.$,
+ febs = layui.febs,
+ layer = layui.layer,
+ form = layui.form,
+ mallSalesman = [[${mallSalesman}]];
+ form.render();
+ initUserValue();
+ function initUserValue() {
+ form.val("salesman-update-form", {
+ "id": mallSalesman.id,
+ "name": mallSalesman.name,
+ "remark": mallSalesman.remark
+ });
+ }
+
+ form.on('submit(salesman-update-form-submit)', function (data) {
+ febs.post(ctx + 'admin/mallMember/salesmanUpdate', data.field, function () {
+ layer.closeAll();
+ febs.alert.success('操作成功');
+ $('#febs-salesman').find('#reset').click();
+ });
+ return false;
+ });
+ });
+</script>
\ No newline at end of file
--
Gitblit v1.9.1