From 29bf89e3f30c1aaa09b34b1a2b9c572d3c070e29 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 07 Jul 2025 20:05:16 +0800
Subject: [PATCH] 退货原因状态
---
oying-system/src/main/java/com/oying/modules/sh/rest/OrderController.java | 50 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 34 insertions(+), 16 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..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,10 +1,13 @@
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;
@@ -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,28 +52,42 @@
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<>(R.success(), 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<>(R.success(), 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<>(R.success(), HttpStatus.OK);
--
Gitblit v1.9.3