From 941c656739a1fedb21d58fd8c63ade74a4f6a275 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 10 Jul 2025 15:51:49 +0800
Subject: [PATCH] 审核退款订单
---
oying-system/src/main/java/com/oying/modules/sh/rest/OrderController.java | 82 +++++++++++++++++++++++++++++-----------
1 files changed, 59 insertions(+), 23 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 a87ae9c..3ee152d 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,26 +1,34 @@
package com.oying.modules.sh.rest;
import com.oying.annotation.Log;
-import com.oying.modules.sh.domain.Order;
+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;
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;
+
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
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;
-import com.oying.utils.PageResult;
/**
-* @author lixin
-* @date 2025-06-11
-**/
+ * @author lixin
+ * @date 2025-06-11
+ **/
@RestController
@RequiredArgsConstructor
@Api(tags = "SH：订单信息")
@@ -39,35 +47,63 @@
@GetMapping
@ApiOperation("查询订单信息")
@PreAuthorize("@el.check('order:list')")
- public ResponseEntity<PageResult<Order>> queryOrder(OrderQueryCriteria criteria){
+ public ResponseEntity<Object> queryOrder(OrderQueryCriteria criteria) {
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(orderService.queryAll(criteria,page),HttpStatus.OK);
+ 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);
- return new ResponseEntity<>(HttpStatus.CREATED);
+ @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);
}
- @PutMapping
- @Log("修改订单信息")
- @ApiOperation("修改订单信息")
- @PreAuthorize("@el.check('order:edit')")
- public ResponseEntity<Object> updateOrder(@Validated @RequestBody Order resources){
- orderService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+ @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("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<>(HttpStatus.OK);
+ 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