Merge branch 'master' into xin

xin

2025-07-19 8841ef182bbe06a7ef1f102f51810502dde0a76f

 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();
    }
}