From 1d2139950d2ef8867c39fa8c8e9af8db178eaa27 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期五, 19 五月 2023 16:21:14 +0800 Subject: [PATCH] demo补完 --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java index 77e11bb..e3277da 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java @@ -120,4 +120,17 @@ List<MerOrderPageVo> merOrderPageVoList = orderService.pageMerOrder(page,merOrderPageDto); return R.ok(page.setRecords(merOrderPageVoList)); } + + @RequestMapping(value = "/pageMerMemberOrder", method = RequestMethod.POST) + @ApiOperation(value = "分页商户端用户收银记录") + public R<Page<MerMemberNoClearOrderVo>> pageMerMemberOrder(@RequestBody MerMemberNoClearOrderDto merMemberNoClearOrderDto) { + Long userId = SecurityUtils.getUserId(); + merMemberNoClearOrderDto.setUserId(userId); + Page<MerMemberNoClearOrderVo> page = new Page<>(); + page.setSize(merMemberNoClearOrderDto.getPageSize()); + page.setCurrent(merMemberNoClearOrderDto.getPageNum()); + + List<MerMemberNoClearOrderVo> merMemberNoClearOrderVoList = orderService.pageMerMemberOrder(page,merMemberNoClearOrderDto); + return R.ok(page.setRecords(merMemberNoClearOrderVoList)); + } } -- Gitblit v1.7.1