From 7ece553fd95f30dcfafa66f667ef9d0c064a22e6 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Sat, 19 Jul 2025 16:27:12 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-system/src/main/java/com/oying/modules/sh/rest/OrderController.java | 19 ++++++++++++++-----
1 files changed, 14 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 2815777..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
@@ -3,6 +3,7 @@
import com.oying.annotation.Log;
import com.oying.modules.sh.domain.Order;
import com.oying.modules.sh.domain.request.GeneratorOrder;
+import com.oying.modules.sh.domain.request.StatusOrder;
import com.oying.modules.sh.domain.request.SubmitOrder;
import com.oying.modules.sh.service.OrderService;
import com.oying.modules.sh.domain.dto.OrderQueryCriteria;
@@ -76,6 +77,14 @@
return new ResponseEntity<>(R.success(orderService.generatorOrder(generator)), HttpStatus.CREATED);
}
+ @PostMapping("status")
+ @Log("更新订单状态")
+ @ApiOperation("更新订单状态")
+ public ResponseEntity<Object> statusOrder(@Validated @RequestBody StatusOrder statusOrder) {
+ orderService.statusOrder(statusOrder);
+ return new ResponseEntity<>(R.success(), HttpStatus.CREATED);
+ }
+
@PostMapping("submit")
@Log("小程序：提交订单")
@ApiOperation("小程序：提交订单")
@@ -91,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