From 3e95b11cff2e6f59a7d23448f86d3d3bf806e13a Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期五, 06 十二月 2024 18:08:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index 1bdb648..5c9cab3 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -3,17 +3,15 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.service.OrderService;
+import io.swagger.annotations.*;
import org.springframework.web.bind.annotation.*;
-import vo.OrderDetailVO;
-import com.ruoyi.order.vo.OrderVO;
+import com.ruoyi.order.vo.OrderDetailVO;
import com.ruoyi.system.api.model.LoginUser;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import model.Order;
+import com.ruoyi.order.model.Order;
import javax.annotation.Resource;
import java.util.List;
@@ -29,7 +27,7 @@
@Api(tags = "订单")
@RestController
@RequestMapping("/order")
-public class OrderController {
+public class OrderController extends BaseController {
@Resource
private OrderService orderService;
@Resource
@@ -43,10 +41,11 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "订单状态", name = "status", required = true, dataType = "int"),
})
- @GetMapping("/getMyOrderList/{status}")
- public R<List<OrderVO>> getMyOrderList(@PathVariable("status") Integer status){
+ @GetMapping("/getMyOrderList")
+ public TableDataInfo getMyOrderList(@ApiParam("订单状态") Integer status){
+ startPage();
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
- return R.ok(orderService.selectOrderListByUserId(status, loginUserApplet.getUserid()));
+ return getDataTable(orderService.selectOrderListByUserId(status, loginUserApplet.getUserid()));
}
/**
--
Gitblit v1.7.1