From 6f3c170403f34d452b5dc733043145d8d760fe41 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 05 Sep 2025 18:04:17 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-system/src/main/java/com/oying/modules/system/rest/MerchantController.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/system/rest/MerchantController.java b/oying-system/src/main/java/com/oying/modules/system/rest/MerchantController.java
index 096a90c..0d41388 100644
--- a/oying-system/src/main/java/com/oying/modules/system/rest/MerchantController.java
+++ b/oying-system/src/main/java/com/oying/modules/system/rest/MerchantController.java
@@ -4,23 +4,27 @@
import com.oying.modules.system.domain.Merchant;
import com.oying.modules.system.service.MerchantService;
import com.oying.modules.system.domain.dto.MerchantsQueryCriteria;
+import com.oying.utils.R;
import lombok.RequiredArgsConstructor;
+
import java.util.List;
+
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.*;
import io.swagger.annotations.*;
+
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
+
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.oying.utils.PageResult;
/**
-* @author lixin
-* @date 2025-05-29
-**/
+ * @author lixin
+ * @date 2025-05-29
+ **/
@RestController
@RequiredArgsConstructor
@Api(tags = "系统：商户信息")
@@ -39,27 +43,27 @@
@GetMapping
@ApiOperation("查询商户信息")
@PreAuthorize("@el.check('merchant:list')")
- public ResponseEntity<PageResult<Merchant>> queryMerchants(MerchantsQueryCriteria criteria){
+ public ResponseEntity<Object> queryMerchants(MerchantsQueryCriteria criteria) {
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(merchantService.queryAll(criteria,page),HttpStatus.OK);
+ return new ResponseEntity<>(R.success(merchantService.queryAll(criteria, page)), HttpStatus.OK);
}
@PostMapping
@Log("新增商户信息")
@ApiOperation("新增商户信息")
@PreAuthorize("@el.check('merchant:add')")
- public ResponseEntity<Object> createMerchants(@Validated @RequestBody Merchant resources){
+ public ResponseEntity<Object> createMerchants(@Validated @RequestBody Merchant resources) {
merchantService.create(resources);
- return new ResponseEntity<>(HttpStatus.CREATED);
+ return new ResponseEntity<>(R.success(), HttpStatus.CREATED);
}
@PutMapping
@Log("修改商户信息")
@ApiOperation("修改商户信息")
@PreAuthorize("@el.check('merchant:edit')")
- public ResponseEntity<Object> updateMerchants(@Validated @RequestBody Merchant resources){
+ public ResponseEntity<Object> updateMerchants(@Validated @RequestBody Merchant resources) {
merchantService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+ return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);
}
@DeleteMapping
@@ -68,6 +72,6 @@
@PreAuthorize("@el.check('merchant:del')")
public ResponseEntity<Object> deleteMerchants(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
merchantService.deleteAll(ids);
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
}
--
Gitblit v1.9.3