From a071c70355a0ac580ff124e6fbc4bf4c07d9efb0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 06 八月 2025 12:30:27 +0800
Subject: [PATCH] 所有代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 e96f823..9666f04 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
@@ -152,7 +152,7 @@
@ApiImplicitParam(value = "订单状态", name = "status", required = true, dataType = "int"),
})
@GetMapping("/getMyOrderList")
- public TableDataInfo<OrderVO> getMyOrderList(@ApiParam("订单状态") Integer status) {
+ public TableDataInfo<OrderVO> getMyOrderList(@RequestParam("订单状态") Integer status) {
startPage();
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
return getDataTable(orderService.selectOrderListByUserId(status, loginUserApplet.getUserid()));
@@ -195,18 +195,18 @@
*/
@ApiOperation(value = "订单核销", tags = {"小程序-个人中心-门店管理"})
@GetMapping("/writeOff")
- public R<Void> writeOff(@ApiParam("id") String id, @ApiParam("shopId") Integer shopId) {
+ public R<Void> writeOff(@RequestParam("id") String id, @RequestParam("shopId") Integer shopId) {
orderService.writeOff(id, shopId);
return R.ok();
}
@GetMapping("/getShopOrderList")
@ApiOperation(value = "获取订单列表", tags = {"门店后台-订单管理", })
- public R<IPage<OrderPageListVo>> getShopOrderList(@ApiParam("模糊查询：订单编号/商品名/手机号 ") String content ,
- @ApiParam("订单状态") Integer status,
- @ApiParam("门店id") Integer shopId,
- @ApiParam("页码") @RequestParam("pageNum") Integer pageNum,
- @ApiParam("每一页数据大小") @RequestParam("pageSize") Integer pageSize) {
+ public R<IPage<OrderPageListVo>> getShopOrderList(@RequestParam("content") String content ,
+ @RequestParam("status") Integer status,
+ @RequestParam("shopId") Integer shopId,
+ @RequestParam("pageNum") Integer pageNum,
+ @RequestParam("pageSize") Integer pageSize) {
return R.ok(orderService.getShopOrderList(content,status,shopId,pageNum,pageSize));
}
@PostMapping("/importExpress")
--
Gitblit v1.7.1