From 5e3829ee63f5bf4909d7c4b57ea048b2fd87a99b Mon Sep 17 00:00:00 2001
From: zepengdev <lzpsmith@outlook.com>
Date: Fri, 29 Aug 2025 09:58:20 +0800
Subject: [PATCH] feat: 店铺与商品审核查询增加筛选条件
---
oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryMerchantController.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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 3e52c0a..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
@@ -5,9 +5,8 @@
import cn.hutool.core.lang.tree.TreeNodeConfig;
import cn.hutool.core.lang.tree.TreeUtil;
import cn.hutool.core.util.BooleanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.oying.annotation.Log;
-import com.oying.modules.pc.common.core.domain.R;
+import com.oying.utils.R;
import com.oying.modules.pc.store.domain.StoreCategory;
import com.oying.modules.pc.store.domain.dto.*;
import com.oying.modules.pc.store.service.StoreCategoryService;
@@ -43,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);
@@ -78,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);
@@ -127,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