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/OrderOperationLogController.java |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 52 insertions(+), 0 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/sh/rest/OrderOperationLogController.java b/oying-system/src/main/java/com/oying/modules/sh/rest/OrderOperationLogController.java
new file mode 100644
index 0000000..3ef4e6f
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/sh/rest/OrderOperationLogController.java
@@ -0,0 +1,52 @@
+package com.oying.modules.sh.rest;
+
+import com.oying.modules.sh.service.OrderOperationLogService;
+import com.oying.modules.sh.domain.dto.OrderOperationLogQueryCriteria;
+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;
+
+/**
+ * @author lixin
+ * @date 2025-06-11
+ **/
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "SH:订单操作日志")
+@RequestMapping("/api/orderOperationLog")
+public class OrderOperationLogController {
+
+    private final OrderOperationLogService orderOperationLogService;
+
+    @ApiOperation("导出数据")
+    @GetMapping(value = "/download")
+    @PreAuthorize("@el.check('orderOperationLog:list')")
+    public void exportOrderOperationLog(HttpServletResponse response, OrderOperationLogQueryCriteria criteria) throws IOException {
+        orderOperationLogService.download(orderOperationLogService.queryAll(criteria), response);
+    }
+
+    @GetMapping
+    @ApiOperation("查询订单操作日志")
+    @PreAuthorize("@el.check('orderOperationLog:list')")
+    public ResponseEntity<Object> queryOrderOperationLog(OrderOperationLogQueryCriteria criteria) {
+        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
+        return new ResponseEntity<>(R.success(orderOperationLogService.queryAll(criteria, page)), HttpStatus.OK);
+    }
+
+    @GetMapping("getByOrderNum")
+    @ApiOperation("根据订单号查询订单操作日志")
+    @PreAuthorize("@el.check('orderOperationLog:list')")
+    public ResponseEntity<Object> queryOrderOperationLog(@RequestParam String orderNum) {
+        return new ResponseEntity<>(R.success(orderOperationLogService.getByOrderNum(orderNum)), HttpStatus.OK);
+    }
+}

--
Gitblit v1.9.3