From b4f2219ce06b1b1d3fe4631090b58fd9f9a7824d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 22 Sep 2021 17:48:22 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 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..d236b9d 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java
@@ -3,16 +3,24 @@
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.service.IAdminMallGoodsService;
+import cc.mrbird.febs.mall.service.IAdminMallMemberService;
+import cc.mrbird.febs.mall.vo.AdminMailGoodsDetailVo;
+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")
@RequestMapping(FebsConstant.VIEW_PREFIX + "modules/goods")
@RequiredArgsConstructor
public class ViewMallGoodsController extends BaseController {
+
+ private final IAdminMallGoodsService mallGoodsService;
/**
* 商品列表
@@ -43,4 +51,18 @@
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");
+ }
}
--
Gitblit v1.9.1