From 3fb300fe477e128976b1583ebc1a57aae372c645 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 30 Dec 2024 17:37:44 +0800
Subject: [PATCH] refactor(mallMember): 注释掉会员列表中的到期时间字段 - 在 mallMemberList.html 文件中，添加了对 '到期时间' 字段的注释 -此修改可能是为了暂时移除或隐藏该字段的显示

---
 src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsCategoryController.java |  105 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 104 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsCategoryController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsCategoryController.java
index 92acc71..33ed194 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsCategoryController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsCategoryController.java
@@ -5,8 +5,10 @@
 import cc.mrbird.febs.common.entity.FebsResponse;
 import cc.mrbird.febs.common.entity.QueryRequest;
 import cc.mrbird.febs.mall.entity.MallGoodsCategory;
+import cc.mrbird.febs.mall.entity.MallStore;
+import cc.mrbird.febs.mall.entity.MallStoreItem;
 import cc.mrbird.febs.mall.service.IAdminMallGoodsCategoryService;
-import cc.mrbird.febs.mall.vo.AdminAddAddressTreeVo;
+import cc.mrbird.febs.mall.service.IApiMallGoodsCategoryService;
 import cc.mrbird.febs.mall.vo.AdminMallGoodsCategoryTreeVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -26,6 +28,88 @@
 public class AdminMallGoodsCategoryController extends BaseController {
 
     private final IAdminMallGoodsCategoryService goodsCategoryService;
+    private final IApiMallGoodsCategoryService mallGoodsCategoryService;
+
+    /**
+     * 机器列表
+     */
+    @GetMapping("storeItemList")
+    public FebsResponse storeItemList(MallStoreItem mallStoreItem, QueryRequest request) {
+        Map<String, Object> data = getDataTable(goodsCategoryService.storeItemList(mallStoreItem, request));
+        return new FebsResponse().success().data(data);
+    }
+
+    /**
+     * 机器-选择
+     */
+    @GetMapping("storeItem/tree")
+    @ControllerEndpoint(exceptionMessage = "获取分类失败")
+    public FebsResponse getStore(){
+        return new FebsResponse().success().data(goodsCategoryService.getStore());
+    }
+
+    /**
+     * 机器-新增
+     */
+    @PostMapping("addStoreItem")
+    @ControllerEndpoint(operation = "机器-新增", exceptionMessage = "操作失败")
+    public FebsResponse addStoreItem(@Valid MallStoreItem mallStoreItem) {
+        return goodsCategoryService.addStoreItem(mallStoreItem);
+    }
+
+    /**
+     * 机器-编辑
+     */
+    @PostMapping("updateStoreItem")
+    @ControllerEndpoint(operation = "机器-编辑", exceptionMessage = "操作失败")
+    public FebsResponse updateStoreItem(@Valid MallStoreItem mallStoreItem) {
+        return goodsCategoryService.updateStoreItem(mallStoreItem);
+    }
+
+    /**
+     * 机器-删除
+     */
+    @GetMapping("delStoreItem/{id}")
+    @ControllerEndpoint(operation = "机器-删除", exceptionMessage = "操作失败")
+    public FebsResponse delStoreItem(@NotNull(message = "{required}") @PathVariable Long id) {
+        return goodsCategoryService.delStoreItem(id);
+    }
+
+    /**
+     * 店铺列表
+     */
+    @GetMapping("storeList")
+    public FebsResponse storeList(MallStore mallStore, QueryRequest request) {
+        Map<String, Object> data = getDataTable(goodsCategoryService.storeList(mallStore, request));
+        return new FebsResponse().success().data(data);
+    }
+
+    /**
+     * 店铺-新增
+     */
+    @PostMapping("addStore")
+    @ControllerEndpoint(operation = "店铺-新增", exceptionMessage = "操作失败")
+    public FebsResponse addStore(@Valid MallStore mallStore) {
+        return goodsCategoryService.addStore(mallStore);
+    }
+
+    /**
+     * 店铺-编辑
+     */
+    @PostMapping("updateStore")
+    @ControllerEndpoint(operation = "店铺-编辑", exceptionMessage = "操作失败")
+    public FebsResponse updateStore(@Valid MallStore mallStore) {
+        return goodsCategoryService.updateStore(mallStore);
+    }
+
+    /**
+     * 店铺-删除
+     */
+    @GetMapping("delStore/{id}")
+    @ControllerEndpoint(operation = "店铺-删除", exceptionMessage = "操作失败")
+    public FebsResponse delStore(@NotNull(message = "{required}") @PathVariable Long id) {
+        return goodsCategoryService.delStore(id);
+    }
 
     /**
      * 商品分类列表
@@ -44,6 +128,16 @@
         return new FebsResponse().success().data(goodsCategoryService.getCategorys(mallGoodsCategory));
     }
 
+    @GetMapping(value = "/categoryTree")
+    public FebsResponse categoryTree() {
+        return new FebsResponse().success().data(mallGoodsCategoryService.findAllCategoryList());
+    }
+
+    @GetMapping(value = "/addressMYXL")
+    public FebsResponse addressMYXL() {
+        return new FebsResponse().success().data(mallGoodsCategoryService.findAllAddressList());
+    }
+
     /**
      * 商品分类-选择
      */
@@ -54,6 +148,15 @@
     }
 
     /**
+     * 商品分类-全部选择
+     */
+    @GetMapping("categorys/allTree")
+    @ControllerEndpoint(exceptionMessage = "获取分类失败")
+    public List<AdminMallGoodsCategoryTreeVo> getAllCategorys(){
+        return goodsCategoryService.getAllCategorys();
+    }
+
+    /**
      * 商品分类-新增
      */
     @PostMapping("addCategory")

--
Gitblit v1.9.1