From c681ae8c728244d20235ba82dd510ffa161ab66d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 20 Feb 2023 10:31:02 +0800
Subject: [PATCH] 商品现价改成折扣价 隐藏了成本价 重量的备注设置为克

---
 src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java |  129 +++++++++++++++++++++++++++++-------------
 1 files changed, 88 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..ce589b0 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,88 @@
         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");
+    }
+
+    /**
+     * 推销员列表-选择
+     * @param id
+     * @param model
+     * @return
+     */
+    @GetMapping("agentSelect/{id}")
+    @RequiresPermissions("agentSelect:update")
+    public String agentSelect(@PathVariable long id, Model model) {
+        AdminAgentSelectVo data = mallSalesmanMapper.agentSelect(id);
+        model.addAttribute("adminAgentSelectVo", data);
+        return FebsUtil.view("modules/mallMember/agentSelect");
+    }
+
+    /**
+     * 地址金额统计列表
+     */
+    @GetMapping("addressAmountList")
+    @RequiresPermissions("addressAmountList:view")
+    public String addressAmountList() {
+        return FebsUtil.view("modules/mallMember/addressAmountList");
+    }
+
+    /**
+     * 地址金额统计列表
+     */
+    @GetMapping("salesmanAchieveList")
+    @RequiresPermissions("salesmanAchieveList:view")
+    public String salesmanAchieveList() {
+        return FebsUtil.view("modules/mallMember/salesmanAchieveList");
+    }
 
 
 }

--
Gitblit v1.9.1