From 43d9975c99cb947b4602f05bc2e513a20de92c38 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 06 五月 2023 20:30:42 +0800
Subject: [PATCH] 商户端主流程

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 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 53bff3f..77e11bb 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
@@ -109,5 +109,15 @@
         return R.ok();
     }
 
-
+    @RequestMapping(value = "/pageMerOrder", method = RequestMethod.POST)
+    @ApiOperation(value = "获取商户端订单列表")
+    public R<Page<MerOrderPageVo>> pageMerOrder(@RequestBody MerOrderPageDto merOrderPageDto) {
+        Long userId = SecurityUtils.getUserId();
+        merOrderPageDto.setUserId(userId);
+        Page<MerOrderPageVo> page = new Page<>();
+        page.setSize(merOrderPageDto.getPageSize());
+        page.setCurrent(merOrderPageDto.getPageNum());
+        List<MerOrderPageVo> merOrderPageVoList = orderService.pageMerOrder(page,merOrderPageDto);
+        return R.ok(page.setRecords(merOrderPageVoList));
+    }
 }

--
Gitblit v1.7.1