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/OrderReturnController.java | 63 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 23 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnController.java b/oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnController.java
index 276f674..e449512 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnController.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnController.java
@@ -2,25 +2,29 @@
import com.oying.annotation.Log;
import com.oying.modules.sh.domain.OrderReturn;
+import com.oying.modules.sh.domain.request.AuditOrderReturn;
+import com.oying.modules.sh.domain.request.ReturnOrder;
import com.oying.modules.sh.service.OrderReturnService;
import com.oying.modules.sh.domain.dto.OrderReturnQueryCriteria;
+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,35 +43,48 @@
@GetMapping
@ApiOperation("查询退款订单")
@PreAuthorize("@el.check('orderReturn:list')")
- public ResponseEntity<PageResult<OrderReturn>> queryOrderReturn(OrderReturnQueryCriteria criteria){
+ public ResponseEntity<Object> queryOrderReturn(OrderReturnQueryCriteria criteria) {
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(orderReturnService.queryAll(criteria,page),HttpStatus.OK);
+ return new ResponseEntity<>(R.success(orderReturnService.queryAll(criteria, page)), HttpStatus.OK);
+ }
+
+ @ApiOperation("订单号订单售后")
+ @GetMapping(value = "/getByReturnNum")
+ public ResponseEntity<Object> getByReturnNum(@RequestParam String returnNum) {
+ return new ResponseEntity<>(R.success(orderReturnService.getByReturnNum(returnNum)), HttpStatus.OK);
}
@PostMapping
- @Log("新增退款订单")
- @ApiOperation("新增退款订单")
- @PreAuthorize("@el.check('orderReturn:add')")
- public ResponseEntity<Object> createOrderReturn(@Validated @RequestBody OrderReturn resources){
+ @Log("申请订单售后")
+ @ApiOperation("申请订单售后")
+ public ResponseEntity<Object> createOrderReturn(@Validated @RequestBody ReturnOrder resources) {
orderReturnService.create(resources);
- return new ResponseEntity<>(HttpStatus.CREATED);
+ return new ResponseEntity<>(R.success(), HttpStatus.CREATED);
+ }
+
+ @PostMapping("cancel")
+ @Log("取消订单售后")
+ @ApiOperation("取消订单售后")
+ public ResponseEntity<Object> cancel(@RequestParam String returnNum) {
+ orderReturnService.cancel(returnNum);
+ return new ResponseEntity<>(R.success(), HttpStatus.CREATED);
+ }
+
+ @PutMapping("audit")
+ @Log("审核退款订单")
+ @ApiOperation("审核退款订单")
+ @PreAuthorize("@el.check('orderReturn:edit')")
+ public ResponseEntity<Object> audit(@Validated @RequestBody AuditOrderReturn resources) {
+ orderReturnService.audit(resources);
+ return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);
}
@PutMapping
@Log("修改退款订单")
@ApiOperation("修改退款订单")
@PreAuthorize("@el.check('orderReturn:edit')")
- public ResponseEntity<Object> updateOrderReturn(@Validated @RequestBody OrderReturn resources){
+ public ResponseEntity<Object> updateOrderReturn(@Validated @RequestBody OrderReturn resources) {
orderReturnService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
- }
-
- @DeleteMapping
- @Log("删除退款订单")
- @ApiOperation("删除退款订单")
- @PreAuthorize("@el.check('orderReturn:del')")
- public ResponseEntity<Object> deleteOrderReturn(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
- orderReturnService.deleteAll(ids);
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);
}
}
--
Gitblit v1.9.3