From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java | 29 +++++++++++++++++++++++------
1 files changed, 23 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 2954027..90fd209 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,8 +66,13 @@
Long userId = SecurityUtils.getUserId();
mgtMemberOrderPageDto.setUserId(userId);
Page<MgtMemberOrderPageVo> page = new Page<>();
- page.setSize(2000);
- page.setCurrent(1);
+ 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()){
List<MgtOrderGoodsPageVo> mgtOrderGoodsVoList;
@@ -92,6 +98,8 @@
return R.ok(mgtOrderTotal);
}
+
+
@RequestMapping(value = "/pageMgtActivityOrder", method = RequestMethod.POST)
@ApiOperation(value = "平台获取秒杀订单列表")
public R<Page<MgtActivityOrderPageVo>> pageMgtActivityOrder(@RequestBody MgtShopOrderPageDto mgtShopOrderPageDto) {
@@ -110,11 +118,11 @@
Long userId = SecurityUtils.getUserId();
mgtShopOrderPageDto.setUserId(userId);
Page<MgtActivityOrderPageVo> page = new Page<>();
- page.setSize(2000);
+ 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)
@@ -135,11 +143,11 @@
Long userId = SecurityUtils.getUserId();
mgtShopOrderPageDto.setUserId(userId);
Page<MgtShopOrderPageVo> page = new Page<>();
- page.setSize(2000);
+ 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)
@@ -151,6 +159,15 @@
return R.ok(mgtOrderDetail);
}
+ @RequestMapping(value = "/getMgtShopAllOrderTotal", method = RequestMethod.POST)
+ @ApiOperation(value = "获取商户订单统计")
+ public R<MgtShopAllOrderTotal> getMgtShopAllOrderTotal(@RequestBody MgtShopAllOrderPageDto mgtShopAllOrderPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtShopAllOrderPageDto.setUserId(userId);
+ MgtShopAllOrderTotal shopAllOrderTotal = orderService.getMgtShopAllOrderTotal(mgtShopAllOrderPageDto);
+ return R.ok(shopAllOrderTotal);
+ }
+
@RequestMapping(value = "/pageMgtShopAllOrder", method = RequestMethod.POST)
@ApiOperation(value = "平台获取商户订单记录")
public R<Page<MgtShopAllOrderPageVo>> pageMgtShopAllOrder(@RequestBody MgtShopAllOrderPageDto mgtShopAllOrderPageDto) {
--
Gitblit v1.7.1