From bf7ebe760405f3ab1977b015fc8e4c7a642e1871 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 26 九月 2025 13:47:20 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java
index aa4c921..f839a10 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java
@@ -116,10 +116,10 @@
public void exportPageMgtActivityOrder( MgtShopOrderPageDto mgtShopOrderPageDto, HttpServletResponse response) {
Long userId = SecurityUtils.getUserId();
mgtShopOrderPageDto.setUserId(userId);
- Page<MgtActivityOrderPageVo> page = new Page<>();
- page.setSize(Integer.MAX_VALUE);
- page.setCurrent(1);
- List<MgtActivityOrderPageVo> mgtActivityOrderPageVos = orderService.pageMgtActivityOrder(page,mgtShopOrderPageDto);
+// Page<MgtActivityOrderPageVo> page = new Page<>();
+// page.setSize(Integer.MAX_VALUE);
+// page.setCurrent(1);
+ List<MgtActivityOrderPageVo> mgtActivityOrderPageVos = orderService.pageMgtActivityOrder(null,mgtShopOrderPageDto);
ExcelUtil<MgtActivityOrderPageVo> util = new ExcelUtil<MgtActivityOrderPageVo>(MgtActivityOrderPageVo.class);
util.exportExcel(response, mgtActivityOrderPageVos, "秒杀订单列表", "秒杀订单列表");
}
@@ -206,6 +206,32 @@
public R refundOrderBySys(@RequestBody CancelOrderDTO dto) {
return orderService.refundOrderBySys(dto);
}
- //todo 分页获取三方订单
- //todo 导出三方订单
+
+
+ //分页获取三方订单
+ @RequestMapping(value = "/pageMgtThirdOrder", method = RequestMethod.POST)
+ @ApiOperation(value = "分页获取三方订单【2.0】")
+ public R<Page<MgtThirdOrderPageVo>> pageMgtThirdOrder(@RequestBody MgtThirdOrderPageDto dto) {
+ Long userId = SecurityUtils.getUserId();
+ dto.setUserId(userId);
+ Page<MgtThirdOrderPageVo> page = new Page<>();
+ page.setSize(dto.getPageSize());
+ page.setCurrent(dto.getPageNum());
+ List<MgtThirdOrderPageVo> thirdOrderPageVoList = orderService.pageMgtThirdOrder(page,dto);
+ return R.ok(page.setRecords(thirdOrderPageVoList));
+ }
+ // 导出三方订单
+ @RequestMapping(value = "/exportPageMgtThirdOrder", method = RequestMethod.POST)
+ @ApiOperation(value = "导出三方订单列表【2.0】")
+ public void exportPageMgtThirdOrder( MgtThirdOrderPageDto mgtShopOrderPageDto, HttpServletResponse response) {
+ Long userId = SecurityUtils.getUserId();
+ mgtShopOrderPageDto.setUserId(userId);
+ Page<MgtThirdOrderPageVo> page = new Page<>();
+ page.setSize(Integer.MAX_VALUE);
+ page.setCurrent(1);
+ List<MgtThirdOrderPageVo> mgtActivityOrderPageVos = orderService.pageMgtThirdOrder(page,mgtShopOrderPageDto);
+ ExcelUtil<MgtThirdOrderPageVo> util = new ExcelUtil<MgtThirdOrderPageVo>(MgtThirdOrderPageVo.class);
+ util.exportExcel(response, mgtActivityOrderPageVos, "秒杀订单列表", "秒杀订单列表");
+ }
+
}
--
Gitblit v1.7.1