From 3660c62eca4ec4bf3fda22607abdf6d702f06abd Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Tue, 08 Jul 2025 16:34:33 +0800
Subject: [PATCH] 新增主键替代复合主键
---
oying-system/src/main/java/com/oying/modules/sh/rest/OrderController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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 bd51dfc..32d8f30 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,6 +1,7 @@
package com.oying.modules.sh.rest;
import com.oying.annotation.Log;
+import com.oying.exception.BadRequestException;
import com.oying.modules.sh.domain.request.GeneratorOrder;
import com.oying.modules.sh.domain.request.SubmitOrder;
import com.oying.modules.sh.service.OrderService;
@@ -19,6 +20,7 @@
import io.swagger.annotations.*;
import java.io.IOException;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -50,6 +52,17 @@
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) {
@@ -68,14 +81,13 @@
@PostMapping("submit")
@Log("小程序：提交订单")
@ApiOperation("小程序：提交订单")
- public ResponseEntity<Object> submitOrder(@Validated @RequestBody SubmitOrder submit) {
- return new ResponseEntity<>(R.success(orderService.submitOrder(submit)), HttpStatus.CREATED);
+ public ResponseEntity<Object> submitOrder(@Validated @RequestBody SubmitOrder submit, HttpServletRequest request) {
+ return new ResponseEntity<>(R.success(orderService.submitOrder(submit, request)), HttpStatus.CREATED);
}
@DeleteMapping
@Log("删除订单信息")
@ApiOperation("删除订单信息")
- @PreAuthorize("@el.check('order:del')")
public ResponseEntity<Object> deleteOrder(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
orderService.deleteAll(ids);
return new ResponseEntity<>(R.success(), HttpStatus.OK);
--
Gitblit v1.9.3