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 | 35 +++++------------------------------
1 files changed, 5 insertions(+), 30 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
index c69c043..3ef4e6f 100644
--- 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
@@ -1,18 +1,13 @@
package com.oying.modules.sh.rest;
-import com.oying.annotation.Log;
-import com.oying.modules.sh.domain.OrderOperationLog;
import com.oying.modules.sh.service.OrderOperationLogService;
import com.oying.modules.sh.domain.dto.OrderOperationLogQueryCriteria;
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.*;
@@ -48,30 +43,10 @@
return new ResponseEntity<>(R.success(orderOperationLogService.queryAll(criteria, page)), HttpStatus.OK);
}
- @PostMapping
- @Log("新增订单操作日志")
- @ApiOperation("新增订单操作日志")
- @PreAuthorize("@el.check('orderOperationLog:add')")
- public ResponseEntity<Object> createOrderOperationLog(@Validated @RequestBody OrderOperationLog resources) {
- orderOperationLogService.create(resources);
- return new ResponseEntity<>(R.success(), HttpStatus.CREATED);
- }
-
- @PutMapping
- @Log("修改订单操作日志")
- @ApiOperation("修改订单操作日志")
- @PreAuthorize("@el.check('orderOperationLog:edit')")
- public ResponseEntity<Object> updateOrderOperationLog(@Validated @RequestBody OrderOperationLog resources) {
- orderOperationLogService.update(resources);
- return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);
- }
-
- @DeleteMapping
- @Log("删除订单操作日志")
- @ApiOperation("删除订单操作日志")
- @PreAuthorize("@el.check('orderOperationLog:del')")
- public ResponseEntity<Object> deleteOrderOperationLog(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
- orderOperationLogService.deleteAll(ids);
- return new ResponseEntity<>(R.success(), 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