From 5df7e1b117d15f3ac1cf398ce2b0c17290774ade Mon Sep 17 00:00:00 2001 From: xin <1099200748@qq.com> Date: Mon, 14 Jul 2025 21:07:01 +0800 Subject: [PATCH] 订单流程 --- oying-system/src/main/java/com/oying/modules/sh/rest/OrderController.java | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 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 1624943..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 @@ -1,6 +1,7 @@ package com.oying.modules.sh.rest; 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; @@ -52,11 +53,20 @@ } @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") @@ -80,4 +90,18 @@ 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