From bb05129db40db646a59ddc90cb097edf063140c1 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 28 Aug 2025 17:01:54 +0800
Subject: [PATCH] 订单-sql优化
---
oying-system/src/main/java/com/oying/modules/sh/rest/OrderController.java | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 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 32d8f30..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,23 +53,21 @@
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("小程序：查询订单信息")
+ @ApiOperation("小程序：查询订单信息列")
public ResponseEntity<Object> miniQueryOrder(OrderQueryCriteria criteria) {
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
criteria.setUserId(SecurityUtils.getCurrentUserId());
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")
@@ -76,6 +75,14 @@
@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")
@@ -92,4 +99,18 @@
orderService.deleteAll(ids);
return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
+
+ @Log("用户取消订单")
+ @ApiOperation("用户取消订单")
+ @PostMapping(value = "/cancel")
+ public ResponseEntity<Object> cancel(@RequestParam String orderNum) {
+ orderService.cancel(orderNum);
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
+ }
+
+ @ApiOperation("订单号查询订单")
+ @GetMapping(value = "/getByOrderNum")
+ public ResponseEntity<Object> getByOrderNum(@RequestParam String orderNum) {
+ return new ResponseEntity<>(R.success(orderService.getByOrderNum(orderNum)), HttpStatus.OK);
+ }
}
--
Gitblit v1.9.3