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/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java | 97 ++++++++++++++++++++++++++++-------------------- 1 files changed, 56 insertions(+), 41 deletions(-) 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 8acf032..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; @@ -68,11 +68,12 @@ * @param model * @return */ - @GetMapping("mallSystemPay/{id}") + @GetMapping("mallSystemPay/{type}/{id}") @RequiresPermissions("mallSystemPay:update") - public String systemPay(@PathVariable long id, Model model) { + public String systemPay(@PathVariable long id, @PathVariable Integer type, Model model) { MallMemberVo data = mallMemberService.getMallMemberInfoById(id); model.addAttribute("systemPay", data); + model.addAttribute("type", type); return FebsUtil.view("modules/mallMember/mallSystemPay"); } @@ -240,41 +241,6 @@ return FebsUtil.view("modules/mallMember/appVerSionUpdate"); } - /** - * 新闻中心-列表 - * @return - */ - @GetMapping("newsInfoList") - @RequiresPermissions("newsInfoList:view") - public String newsInfoList() { - return FebsUtil.view("modules/mallMember/newsInfoList"); - } - - /** - * 新闻中心-新增 - * @return - */ - @GetMapping("newsInfoAdd") - @RequiresPermissions("newsInfoAdd:add") - public String newsInfoAdd() { - return FebsUtil.view("modules/mallMember/newsInfoAdd"); - } - - /** - * 新闻中心-详情 - * @param id - * @param model - * @return - */ - @GetMapping("newsInfoUpdate/{id}") - @RequiresPermissions("newsInfoUpdate:update") - public String newsInfoUpdate(@PathVariable long id, Model model) { - MallNewsInfo data = mallMemberService.getNewsInfoById(id); - model.addAttribute("newsInfo", data); - return FebsUtil.view("modules/mallMember/newsInfoUpdate"); - } - - @GetMapping("shopApply") public String shopApply() { @@ -288,7 +254,56 @@ return FebsUtil.view("modules/mallMember/shopApplyInfo"); } + @GetMapping("updateReferer/{id}") + public String updateReferer(@PathVariable("id") Long id, Model model) { + MallMember member = mallMemberService.getById(id); + model.addAttribute("referer", mallMemberService.findByInviteId(member.getReferrerId())); + model.addAttribute("id", id); + return FebsUtil.view("modules/mallMember/updateRefererId"); + } + @GetMapping("addMember") + public String addMember() { + return FebsUtil.view("modules/mallMember/addMember"); + } + + /** + * 代理申请列表 + */ + @GetMapping("mallAgentRecord") + @RequiresPermissions("mallAgentRecord:view") + public String mallAgentRecord() { + 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"); + } } -- Gitblit v1.9.1