From 2116b5b5802c0de0f126f85cf2ac56a732639e82 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 02 Jul 2025 16:39:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin

---
 oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationController.java |   49 ++++++++++++++++++++++++++++++++-----------------
 1 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationController.java b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationController.java
index 2d5cff5..0c3eaff 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationController.java
@@ -2,8 +2,10 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.oying.annotation.Log;
-import com.oying.modules.pc.store.domain.StoreQualification;
+import com.oying.modules.pc.store.converter.StoreQualificationAssembler;
+import com.oying.modules.pc.store.domain.dto.StoreQualificationCreateRequest;
 import com.oying.modules.pc.store.domain.dto.StoreQualificationQueryCriteria;
+import com.oying.modules.pc.store.domain.dto.StoreQualificationUpdateRequest;
 import com.oying.modules.pc.store.service.StoreQualificationService;
 import com.oying.utils.R;
 import io.swagger.annotations.Api;
@@ -12,7 +14,6 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -25,43 +26,57 @@
 @RestController
 @RequiredArgsConstructor
 @Api(tags = "店铺资质")
-@RequestMapping("/api/storeQualification")
+@RequestMapping("/api/pc/storeQualification")
 public class StoreQualificationController {
 
     private final StoreQualificationService storeQualificationService;
 
-    @GetMapping
+    @GetMapping(value = "/list")
     @ApiOperation("查询店铺资质")
-    @PreAuthorize("@el.check('storeQualification:list')")
-    public ResponseEntity<Object> queryStoreQualification(StoreQualificationQueryCriteria criteria) {
+    // @PreAuthorize("@el.check('storeQualification:list')")
+    public ResponseEntity<?> getStoreQualifications(StoreQualificationQueryCriteria criteria) {
+        return ResponseEntity.ok(R.success(storeQualificationService.queryAll(criteria)));
+    }
+
+    @GetMapping(value = "/page")
+    @ApiOperation("查询店铺资质")
+    // @PreAuthorize("@el.check('storeQualification:list')")
+    public ResponseEntity<?> getStoreQualificationsByPage(StoreQualificationQueryCriteria criteria) {
         Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
-        return new ResponseEntity<>(R.success(storeQualificationService.queryAll(criteria, page)), HttpStatus.OK);
+        return ResponseEntity.ok(R.success(storeQualificationService.queryAll(criteria, page)));
+    }
+
+    @GetMapping(value = "/{qualificationId}")
+    @ApiOperation("查询店铺资质")
+    // @PreAuthorize("@el.check('storeQualification:list')")
+    public ResponseEntity<?> getStoreQualificationById(@PathVariable Long qualificationId) {
+        return ResponseEntity.ok(R.success(storeQualificationService.getById(qualificationId)));
     }
 
     @PostMapping
     @Log("新增店铺资质")
     @ApiOperation("新增店铺资质")
-    @PreAuthorize("@el.check('storeQualification:add')")
-    public ResponseEntity<Object> createStoreQualification(@Validated @RequestBody StoreQualification resources) {
-        storeQualificationService.create(resources);
-        return new ResponseEntity<>(R.success(),HttpStatus.CREATED);
+    // @PreAuthorize("@el.check('storeQualification:add')")
+    public ResponseEntity<Object> createStoreQualification(@Validated @RequestBody StoreQualificationCreateRequest request) {
+        storeQualificationService.create(StoreQualificationAssembler.to(request));
+        return ResponseEntity.status(HttpStatus.CREATED).build();
     }
 
     @PutMapping
     @Log("修改店铺资质")
     @ApiOperation("修改店铺资质")
-    @PreAuthorize("@el.check('storeQualification:edit')")
-    public ResponseEntity<Object> updateStoreQualification(@Validated @RequestBody StoreQualification resources) {
-        storeQualificationService.update(resources);
-        return new ResponseEntity<>(R.success(),HttpStatus.NO_CONTENT);
+    // @PreAuthorize("@el.check('storeQualification:edit')")
+    public ResponseEntity<Object> updateStoreQualification(@Validated @RequestBody StoreQualificationUpdateRequest request) {
+        storeQualificationService.update(request);
+        return ResponseEntity.noContent().build();
     }
 
     @DeleteMapping
     @Log("删除店铺资质")
     @ApiOperation("删除店铺资质")
-    @PreAuthorize("@el.check('storeQualification:del')")
+    // @PreAuthorize("@el.check('storeQualification:del')")
     public ResponseEntity<Object> deleteStoreQualification(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
         storeQualificationService.deleteAll(ids);
-        return new ResponseEntity<>(R.success(),HttpStatus.OK);
+        return ResponseEntity.noContent().build();
     }
 }

--
Gitblit v1.9.3