From 92da9546e1b37b06f78671b34389b1dec9dfadfc Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 06 六月 2023 13:57:42 +0800
Subject: [PATCH] 基础配置
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 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..a7d4201 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
@@ -21,6 +21,8 @@
import java.util.List;
+import static org.reflections.Reflections.log;
+
/**
* @author jqs34
* @ClassName MerOrderController
@@ -33,7 +35,7 @@
@RequestMapping("/mer/order")
public class MerOrderController {
- @Autowired
+ @Resource
private OrderService orderService;
@@ -109,5 +111,30 @@
return R.ok();
}
+ @RequestMapping(value = "/pageMerOrder", method = RequestMethod.POST)
+ @ApiOperation(value = "获取商户端订单列表")
+ public R<Page<MerOrderPageVo>> pageMerOrder(@RequestBody MerOrderPageDto merOrderPageDto) {
+ log.info("merOrderPageDto1----"+merOrderPageDto.toString());
+ Long userId = SecurityUtils.getUserId();
+ merOrderPageDto.setUserId(userId);
+ Page<MerOrderPageVo> page = new Page<>();
+ page.setSize(merOrderPageDto.getPageSize());
+ page.setCurrent(merOrderPageDto.getPageNum());
+ log.info("merOrderPageDto2----"+merOrderPageDto.toString());
+ 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());
+ log.info("merMemberNoClearOrderDto----"+merMemberNoClearOrderDto.toString());
+ List<MerMemberNoClearOrderVo> merMemberNoClearOrderVoList = orderService.pageMerMemberOrder(page,merMemberNoClearOrderDto);
+ return R.ok(page.setRecords(merMemberNoClearOrderVoList));
+ }
}
--
Gitblit v1.7.1