From 0dded054a1744e032c30bc5b10fda1f2c94a4099 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 21 Feb 2024 15:20:48 +0800
Subject: [PATCH] 抽奖

---
 src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 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 bcec09e..1234f09 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java
@@ -3,9 +3,11 @@
 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;
@@ -21,6 +23,16 @@
 public class ViewMallGoodsController extends BaseController {
 
     private final IAdminMallGoodsService mallGoodsService;
+
+    /**
+     * 商品列表
+     * @return
+     */
+    @GetMapping("tzList")
+    @RequiresPermissions("tzList:view")
+    public String tzList() {
+        return FebsUtil.view("modules/goods/tzList");
+    }
 
     /**
      * 商品列表
@@ -72,11 +84,11 @@
      * @param model
      * @return
      */
-    @GetMapping("goodsUpdate/{id}")
-    @RequiresPermissions("goodsUpdate:update")
+    @GetMapping("goodsUpdateNew/{id}")
+    @RequiresPermissions("goodsUpdateNew:update")
     public String goodsUpdate(@PathVariable long id, Model model) {
-        AdminMailGoodsDetailVo data = mallGoodsService.getMallGoodsInfoById(id);
-        model.addAttribute("mailGoodsUpdate", data);
-        return FebsUtil.view("modules/goods/goodsUpdate");
+        MallGoods data = mallGoodsService.selectGoodsById(id);
+        model.addAttribute("goodsInfo", data);
+        return FebsUtil.view("modules/goods/goodsUpdateNew");
     }
 }

--
Gitblit v1.9.1