From f6239d1029da4c51ba3b2cec790f7399a210a3df Mon Sep 17 00:00:00 2001
From: zepengdev <lzpsmith@outlook.com>
Date: Sat, 19 Jul 2025 16:13:27 +0800
Subject: [PATCH] feat: 优化商品和店铺

---
 oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryMerchantController.java |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryMerchantController.java b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryMerchantController.java
index f576684..6eefbd2 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryMerchantController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryMerchantController.java
@@ -42,8 +42,8 @@
     @ApiOperation("查询店铺类目")
     //@PreAuthorize("@el.check('merchant:storeCategory:list')" +
     //        " and @storeMerchantOwnershipService.check(#storeId)")
-    public ResponseEntity<?> getList(@PathVariable Long storeId,
-                                     @RequestParam(value = "recursive", required = false) Boolean recursive) {
+    public ResponseEntity<?> getStoreCategories(@PathVariable Long storeId,
+                                                @RequestParam(value = "recursive", required = false) Boolean recursive) {
 
         StoreCategoryQueryCriteria criteria = new StoreCategoryQueryCriteria();
         criteria.setStoreId(storeId);
@@ -77,7 +77,7 @@
     @ApiOperation("查询店铺类目")
     //@PreAuthorize("@el.check('merchant:storeCategory:list')" +
     //        " and @storeMerchantOwnershipService.check(#storeId)")
-    public ResponseEntity<?> getById(@PathVariable Long categoryId,
+    public ResponseEntity<?> getStoreCategoryById(@PathVariable Long categoryId,
                                      @RequestParam(value = "recursive", required = false) Boolean recursive) {
 
         StoreCategory storeCategory = storeCategoryService.getById(categoryId);
@@ -126,10 +126,20 @@
     @DeleteMapping
     @Log("删除店铺类目")
     @ApiOperation("删除店铺类目")
-    @PreAuthorize("@el.check('storeCategory:del')" +
-            " and @storeMerchantOwnershipService.check(#storeId)")
+    /*@PreAuthorize("@el.check('storeCategory:del')" +
+            " and @storeMerchantOwnershipService.check(#storeId)")*/
     public ResponseEntity<?> deleteStoreCategory(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
         storeCategoryService.deleteAll(ids);
         return ResponseEntity.noContent().build();
     }
+
+    @PostMapping(value = "/delete")
+    @Log("删除店铺类目")
+    @ApiOperation("删除店铺类目")
+    /*@PreAuthorize("@el.check('storeCategory:del')" +
+            " and @storeMerchantOwnershipService.check(#storeId)")*/
+    public ResponseEntity<?> delStoreCategory(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
+        storeCategoryService.deleteAll(ids);
+        return ResponseEntity.noContent().build();
+    }
 }

--
Gitblit v1.9.3