From 2fa295d338b81513b62737ee00948c2de9140c7a Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 20 六月 2025 09:08:00 +0800
Subject: [PATCH] 优惠券管理
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 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 71481e3..e1ca6ff 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
@@ -20,6 +20,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import java.math.BigInteger;
import java.util.List;
import java.util.stream.Collectors;
@@ -65,9 +66,12 @@
Long userId = SecurityUtils.getUserId();
mgtMemberOrderPageDto.setUserId(userId);
Page<MgtMemberOrderPageVo> page = new Page<>();
- if(page.getSize()>5000){
+ if(mgtMemberOrderPageDto.getPageSize() > 5000){
page.setSize(5000);
page.setCurrent(1);
+ }else{
+ page.setSize(mgtMemberOrderPageDto.getPageSize());
+ page.setCurrent(mgtMemberOrderPageDto.getPageNum());
}
List<MgtMemberOrderPageVo> mgtMemberOrderPageVoList = orderService.pageMgtMemberOrder(page,mgtMemberOrderPageDto);
if(!mgtMemberOrderPageVoList.isEmpty()){
@@ -114,13 +118,11 @@
Long userId = SecurityUtils.getUserId();
mgtShopOrderPageDto.setUserId(userId);
Page<MgtActivityOrderPageVo> page = new Page<>();
- if(page.getSize()>5000){
- page.setSize(5000);
- page.setCurrent(1);
- }
+ page.setSize(Integer.MAX_VALUE);
+ page.setCurrent(1);
List<MgtActivityOrderPageVo> mgtActivityOrderPageVos = orderService.pageMgtActivityOrder(page,mgtShopOrderPageDto);
ExcelUtil<MgtActivityOrderPageVo> util = new ExcelUtil<MgtActivityOrderPageVo>(MgtActivityOrderPageVo.class);
- util.exportExcel(response, mgtActivityOrderPageVos, "秒杀订单列表");
+ util.exportExcel(response, mgtActivityOrderPageVos, "秒杀订单列表", "秒杀订单列表");
}
@RequestMapping(value = "/pageMgtShopOrder", method = RequestMethod.POST)
@@ -141,13 +143,11 @@
Long userId = SecurityUtils.getUserId();
mgtShopOrderPageDto.setUserId(userId);
Page<MgtShopOrderPageVo> page = new Page<>();
- if(page.getSize()>5000){
- page.setSize(5000);
- page.setCurrent(1);
- }
+ page.setSize(Integer.MAX_VALUE);
+ page.setCurrent(1);
List<MgtShopOrderPageVo> shopOrderPageVoList = orderService.pageMgtShopOrder(page,mgtShopOrderPageDto);
ExcelUtil<MgtShopOrderPageVo> util = new ExcelUtil<MgtShopOrderPageVo>(MgtShopOrderPageVo.class);
- util.exportExcel(response, shopOrderPageVoList, "门店订单列表");
+ util.exportExcel(response, shopOrderPageVoList, "门店订单列表", "门店订单列表");
}
@RequestMapping(value = "/getMgtOrderDetail", method = RequestMethod.POST)
@@ -161,10 +161,10 @@
@RequestMapping(value = "/getMgtShopAllOrderTotal", method = RequestMethod.POST)
@ApiOperation(value = "获取商户订单统计")
- public R<MgtShopAllOrderTotal> getMgtShopAllOrderTotal(@RequestBody MgtShopOrderPageDto mgtShopOrderPageDto) {
+ public R<MgtShopAllOrderTotal> getMgtShopAllOrderTotal(@RequestBody MgtShopAllOrderPageDto mgtShopAllOrderPageDto) {
Long userId = SecurityUtils.getUserId();
- mgtShopOrderPageDto.setUserId(userId);
- MgtShopAllOrderTotal shopAllOrderTotal = orderService.getMgtShopAllOrderTotal(mgtShopOrderPageDto);
+ mgtShopAllOrderPageDto.setUserId(userId);
+ MgtShopAllOrderTotal shopAllOrderTotal = orderService.getMgtShopAllOrderTotal(mgtShopAllOrderPageDto);
return R.ok(shopAllOrderTotal);
}
@@ -192,4 +192,10 @@
ExcelUtil<MgtShopAllOrderPageVo> util = new ExcelUtil<MgtShopAllOrderPageVo>(MgtShopAllOrderPageVo.class);
util.exportExcel(response, shopAllOrderPageVoList, "商户订单记录");
}
+
+ //todo 取消
+
+ //todo 退款
+ //todo 分页获取三方订单
+ //todo 导出
}
--
Gitblit v1.7.1