diff --git a/src/main/java/com/cultural/heritage/controller/order/OrderController.java b/src/main/java/com/cultural/heritage/controller/order/OrderController.java index 714e3fc..ca91477 100644 --- a/src/main/java/com/cultural/heritage/controller/order/OrderController.java +++ b/src/main/java/com/cultural/heritage/controller/order/OrderController.java @@ -131,7 +131,7 @@ public class OrderController { @PostMapping("/list/page") @Operation(summary = "Web端管理员分页查询订单", description = "参数:订单查询请求体,权限:管理员(admin, boss),方法名:listOrder") @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) - public BaseResponse> listOrder(@RequestBody OrderQueryRequest orderQueryRequest) { + public BaseResponse> listOrder(@RequestBody OrderQueryRequest orderQueryRequest) { if (orderQueryRequest == null) { throw new BusinessException(ErrorCode.PARAMS_ERROR); } @@ -152,7 +152,13 @@ public class OrderController { List list = orderItemService.list(queryWrapper); orderVO.setOrderItemList(list); }); - return ResultUtils.success(orderVOS); + Page orderVOPage = new Page<>(); + orderVOPage.setRecords(orderVOS); + orderVOPage.setTotal(page.getTotal()); + orderVOPage.setPages(page.getPages()); + orderVOPage.setCurrent(page.getCurrent()); + orderVOPage.setSize(page.getSize()); + return ResultUtils.success(orderVOPage); }