From 044a57d2133b2363a6f0d3d167b3eaa587c70b91 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 31 Jul 2025 17:18:47 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-system/src/main/java/com/oying/modules/sh/rest/OrderController.java | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 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 3ee152d..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
@@ -1,8 +1,9 @@
package com.oying.modules.sh.rest;
import com.oying.annotation.Log;
-import com.oying.exception.BadRequestException;
+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;
@@ -52,17 +53,6 @@
return new ResponseEntity<>(R.success(orderService.queryAll(criteria, page)), HttpStatus.OK);
}
- @GetMapping("app")
- @ApiOperation("APP：查询订单信息")
- @PreAuthorize("@el.check('order:list')")
- public ResponseEntity<Object> appQueryOrder(OrderQueryCriteria criteria) {
- if (criteria.getStoreId() == null) {
- throw new BadRequestException("请选择门店");
- }
- Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(R.success(orderService.queryAll(criteria, page)), HttpStatus.OK);
- }
-
@GetMapping("mini")
@ApiOperation("小程序：查询订单信息列")
public ResponseEntity<Object> miniQueryOrder(OrderQueryCriteria criteria) {
@@ -71,11 +61,28 @@
return new ResponseEntity<>(R.success(orderService.queryAll(criteria, page)), HttpStatus.OK);
}
+ @PostMapping
+ @Log("新增订单信息")
+ @ApiOperation("新增订单信息")
+ @PreAuthorize("@el.check('order:add')")
+ public ResponseEntity<Object> create(@Validated @RequestBody Order order) {
+ orderService.create(order);
+ return new ResponseEntity<>(R.success(), HttpStatus.CREATED);
+ }
+
@PostMapping("generator")
@Log("小程序：生成确认订单")
@ApiOperation("小程序：生成确认订单")
public ResponseEntity<Object> generatorOrder(@Validated @RequestBody GeneratorOrder generator) {
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")
@@ -93,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