From 07234fed2dc993366fd4c7673d0e8ada90706bd1 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 15 Sep 2025 11:33:45 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-system/src/main/java/com/oying/modules/sh/rest/OrderController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/sh/rest/OrderController.java b/oying-system/src/main/java/com/oying/modules/sh/rest/OrderController.java
index 97f9ac2..ef8dea9 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/rest/OrderController.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/rest/OrderController.java
@@ -100,11 +100,11 @@
return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
- @Log("关闭订单")
- @ApiOperation("关闭订单")
- @PostMapping(value = "/closeOrder")
- public ResponseEntity<Object> closeOrder(@RequestParam String orderNum) {
- orderService.closeOrder(orderNum);
+ @Log("用户取消订单")
+ @ApiOperation("用户取消订单")
+ @PostMapping(value = "/cancel")
+ public ResponseEntity<Object> cancel(@RequestParam String orderNum) {
+ orderService.cancel(orderNum);
return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
--
Gitblit v1.9.3