From 78bbc1dae1bb20acb51fd454adf53b3ab5ae97b3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Dec 2022 15:20:11 +0800
Subject: [PATCH] 20221221

---
 src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java |   42 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java
index 2f30889..3119c67 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java
@@ -3,10 +3,18 @@
 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.MallGoods;
+import cc.mrbird.febs.mall.service.IAdminMallGoodsService;
+import cc.mrbird.febs.mall.service.IAdminMallMemberService;
+import cc.mrbird.febs.mall.vo.AdminMailGoodsDetailVo;
+import cc.mrbird.febs.mall.vo.AdminMailGoodsUpdateVo;
+import cc.mrbird.febs.mall.vo.MallMemberVo;
 import lombok.RequiredArgsConstructor;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 @Controller("goodsView")
@@ -14,13 +22,15 @@
 @RequiredArgsConstructor
 public class ViewMallGoodsController extends BaseController {
 
+    private final IAdminMallGoodsService mallGoodsService;
+
     /**
      * 商品列表
      * @return
      */
     @GetMapping("goodsList")
     @RequiresPermissions("goodsList:view")
-    public String categoryList() {
+    public String goodsList() {
         return FebsUtil.view("modules/goods/goodsList");
     }
 
@@ -30,7 +40,7 @@
      */
     @GetMapping("goodsAdd")
     @RequiresPermissions("goodsAdd:add")
-    public String helpCenterAdd() {
+    public String goodsAdd() {
         return FebsUtil.view("modules/goods/goodsAddNew");
     }
 
@@ -43,4 +53,32 @@
     public String goodsAddNew() {
         return FebsUtil.view("modules/goods/goodsAddNew");
     }
+
+    /**
+     * 商品-详情
+     * @param id
+     * @param model
+     * @return
+     */
+    @GetMapping("detailGoods/{id}")
+    @RequiresPermissions("detailGoods:update")
+    public String detailGoods(@PathVariable long id, Model model) {
+        AdminMailGoodsDetailVo data = mallGoodsService.getMallGoodsInfoById(id);
+        model.addAttribute("mailGoodsDetail", data);
+        return FebsUtil.view("modules/goods/detailGoods");
+    }
+
+    /**
+     * 商品-编辑-详情
+     * @param id
+     * @param model
+     * @return
+     */
+    @GetMapping("goodsUpdateNew/{id}")
+    @RequiresPermissions("goodsUpdateNew:update")
+    public String goodsUpdate(@PathVariable long id, Model model) {
+        MallGoods data = mallGoodsService.selectGoodsById(id);
+        model.addAttribute("goodsInfo", data);
+        return FebsUtil.view("modules/goods/goodsUpdateNew");
+    }
 }

--
Gitblit v1.9.1