From c1d20b425b10e8ba59f102dd1ab413055883eed0 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Mon, 14 Jul 2025 16:57:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xin' into pxb

---
 oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnOperationLogController.java |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 50 insertions(+), 0 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnOperationLogController.java b/oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnOperationLogController.java
new file mode 100644
index 0000000..6b6b72c
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnOperationLogController.java
@@ -0,0 +1,50 @@
+package com.oying.modules.sh.rest;
+
+import com.oying.modules.sh.domain.OrderReturnOperationLog;
+import com.oying.modules.sh.service.OrderReturnOperationLogService;
+import com.oying.modules.sh.domain.dto.OrderReturnOperationLogQueryCriteria;
+import com.oying.utils.R;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+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-07-02
+**/
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "SH:退订用户操作管理")
+@RequestMapping("/api/orderReturnOperationLog")
+public class OrderReturnOperationLogController {
+
+    private final OrderReturnOperationLogService orderReturnOperationLogService;
+
+    @ApiOperation("导出数据")
+    @GetMapping(value = "/download")
+    @PreAuthorize("@el.check('orderReturnOperationLog:list')")
+    public void exportOrderReturnOperationLog(HttpServletResponse response, OrderReturnOperationLogQueryCriteria criteria) throws IOException {
+        orderReturnOperationLogService.download(orderReturnOperationLogService.queryAll(criteria), response);
+    }
+
+    @GetMapping
+    @ApiOperation("查询退订用户操作管理")
+    @PreAuthorize("@el.check('orderReturnOperationLog:list')")
+    public ResponseEntity<PageResult<OrderReturnOperationLog>> queryOrderReturnOperationLog(OrderReturnOperationLogQueryCriteria criteria){
+        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
+        return new ResponseEntity<>(orderReturnOperationLogService.queryAll(criteria,page),HttpStatus.OK);
+    }
+
+    @GetMapping("getByReturnNum")
+    @ApiOperation("根据退单号查询退单操作日志")
+    public ResponseEntity<Object> getByReturnNum(@RequestParam String returnNum) {
+        return new ResponseEntity<>(R.success(orderReturnOperationLogService.getByReturnNum(returnNum)), HttpStatus.OK);
+    }
+}

--
Gitblit v1.9.3