From 3d6f2cd1483c5e85a3f2eeb2edd89c088d1d5c6b Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 09 五月 2023 22:52:48 +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