From 66772a2d80b2612cea4e1e5740c9df3d2f672a39 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 25 Sep 2025 21:51:20 +0800
Subject: [PATCH] 商户角色优化
---
oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnReasonController.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnReasonController.java b/oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnReasonController.java
index e74300f..54167e0 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnReasonController.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnReasonController.java
@@ -4,23 +4,27 @@
import com.oying.modules.sh.domain.OrderReturnReason;
import com.oying.modules.sh.service.OrderReturnReasonService;
import com.oying.modules.sh.domain.dto.OrderReturnReasonQueryCriteria;
+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-06-11
-**/
+ * @author lixin
+ * @date 2025-06-11
+ **/
@RestController
@RequiredArgsConstructor
@Api(tags = "SH：退货原因表")
@@ -39,27 +43,33 @@
@GetMapping
@ApiOperation("查询退货原因表")
@PreAuthorize("@el.check('orderReturnReason:list')")
- public ResponseEntity<PageResult<OrderReturnReason>> queryOrderReturnReason(OrderReturnReasonQueryCriteria criteria){
+ public ResponseEntity<Object> queryOrderReturnReason(OrderReturnReasonQueryCriteria criteria) {
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(orderReturnReasonService.queryAll(criteria,page),HttpStatus.OK);
+ return new ResponseEntity<>(R.success(orderReturnReasonService.queryAll(criteria, page)), HttpStatus.OK);
+ }
+
+ @GetMapping("mini")
+ @ApiOperation("小程序：查询退货原因表")
+ public ResponseEntity<Object> miniQuery() {
+ return new ResponseEntity<>(R.success(orderReturnReasonService.miniQuery()), HttpStatus.OK);
}
@PostMapping
@Log("新增退货原因表")
@ApiOperation("新增退货原因表")
@PreAuthorize("@el.check('orderReturnReason:add')")
- public ResponseEntity<Object> createOrderReturnReason(@Validated @RequestBody OrderReturnReason resources){
+ public ResponseEntity<Object> createOrderReturnReason(@Validated @RequestBody OrderReturnReason resources) {
orderReturnReasonService.create(resources);
- return new ResponseEntity<>(HttpStatus.CREATED);
+ return new ResponseEntity<>(R.success(), HttpStatus.CREATED);
}
@PutMapping
@Log("修改退货原因表")
@ApiOperation("修改退货原因表")
@PreAuthorize("@el.check('orderReturnReason:edit')")
- public ResponseEntity<Object> updateOrderReturnReason(@Validated @RequestBody OrderReturnReason resources){
+ public ResponseEntity<Object> updateOrderReturnReason(@Validated @RequestBody OrderReturnReason resources) {
orderReturnReasonService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+ return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);
}
@DeleteMapping
@@ -68,6 +78,6 @@
@PreAuthorize("@el.check('orderReturnReason:del')")
public ResponseEntity<Object> deleteOrderReturnReason(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
orderReturnReasonService.deleteAll(ids);
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
}
--
Gitblit v1.9.3