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 | 12 ++++++------
1 files changed, 6 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 d325cf9..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, "秒杀订单列表", "秒杀订单列表");
}
@@ -210,7 +210,7 @@
//分页获取三方订单
@RequestMapping(value = "/pageMgtThirdOrder", method = RequestMethod.POST)
- @ApiOperation(value = "分页获取三方订单")
+ @ApiOperation(value = "分页获取三方订单【2.0】")
public R<Page<MgtThirdOrderPageVo>> pageMgtThirdOrder(@RequestBody MgtThirdOrderPageDto dto) {
Long userId = SecurityUtils.getUserId();
dto.setUserId(userId);
@@ -222,7 +222,7 @@
}
// 导出三方订单
@RequestMapping(value = "/exportPageMgtThirdOrder", method = RequestMethod.POST)
- @ApiOperation(value = "导出三方订单列表")
+ @ApiOperation(value = "导出三方订单列表【2.0】")
public void exportPageMgtThirdOrder( MgtThirdOrderPageDto mgtShopOrderPageDto, HttpServletResponse response) {
Long userId = SecurityUtils.getUserId();
mgtShopOrderPageDto.setUserId(userId);
--
Gitblit v1.7.1