From 6d3f43aceecf5cb35c8440e8593263b0ca1bdcd6 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 14 Jul 2025 21:56:02 +0800
Subject: [PATCH] 订单流程
---
oying-system/src/main/java/com/oying/modules/sh/rest/OrderController.java | 50 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 40 insertions(+), 10 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 3ea87e2..2815777 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
@@ -2,9 +2,12 @@
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.SubmitOrder;
import com.oying.modules.sh.service.OrderService;
import com.oying.modules.sh.domain.dto.OrderQueryCriteria;
import com.oying.utils.R;
+import com.oying.utils.SecurityUtils;
import lombok.RequiredArgsConstructor;
import java.util.List;
@@ -17,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;
@@ -48,30 +52,56 @@
return new ResponseEntity<>(R.success(orderService.queryAll(criteria, page)), HttpStatus.OK);
}
+ @GetMapping("mini")
+ @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> createOrder(@Validated @RequestBody Order resources) {
- orderService.create(resources);
+ public ResponseEntity<Object> create(@Validated @RequestBody Order order) {
+ orderService.create(order);
return new ResponseEntity<>(R.success(), HttpStatus.CREATED);
}
- @PutMapping
- @Log("修改订单信息")
- @ApiOperation("修改订单信息")
- @PreAuthorize("@el.check('order:edit')")
- public ResponseEntity<Object> updateOrder(@Validated @RequestBody Order resources) {
- orderService.update(resources);
- return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);
+ @PostMapping("generator")
+ @Log("小程序：生成确认订单")
+ @ApiOperation("小程序：生成确认订单")
+ public ResponseEntity<Object> generatorOrder(@Validated @RequestBody GeneratorOrder generator) {
+ return new ResponseEntity<>(R.success(orderService.generatorOrder(generator)), HttpStatus.CREATED);
+ }
+
+ @PostMapping("submit")
+ @Log("小程序：提交订单")
+ @ApiOperation("小程序：提交订单")
+ 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);
}
+
+ @Log("关闭订单")
+ @ApiOperation("关闭订单")
+ @PostMapping(value = "/closeOrder")
+ public ResponseEntity<Object> closeOrder(@RequestParam String orderNum) {
+ orderService.closeOrder(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