From b879982d29cb2dbfe72482b46c8f6f2064d663a2 Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期六, 26 八月 2023 15:27:29 +0800
Subject: [PATCH] 支付调整
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java | 21 +++++++++++++++------
1 files changed, 15 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 71481e3..1508dbf 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
@@ -65,9 +65,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,9 +117,12 @@
Long userId = SecurityUtils.getUserId();
mgtShopOrderPageDto.setUserId(userId);
Page<MgtActivityOrderPageVo> page = new Page<>();
- if(page.getSize()>5000){
+ if(mgtShopOrderPageDto.getPageSize() > 5000){
page.setSize(5000);
page.setCurrent(1);
+ }else{
+ page.setSize(mgtShopOrderPageDto.getPageSize());
+ page.setCurrent(mgtShopOrderPageDto.getPageNum());
}
List<MgtActivityOrderPageVo> mgtActivityOrderPageVos = orderService.pageMgtActivityOrder(page,mgtShopOrderPageDto);
ExcelUtil<MgtActivityOrderPageVo> util = new ExcelUtil<MgtActivityOrderPageVo>(MgtActivityOrderPageVo.class);
@@ -141,9 +147,12 @@
Long userId = SecurityUtils.getUserId();
mgtShopOrderPageDto.setUserId(userId);
Page<MgtShopOrderPageVo> page = new Page<>();
- if(page.getSize()>5000){
+ if(mgtShopOrderPageDto.getPageSize() > 5000){
page.setSize(5000);
page.setCurrent(1);
+ }else{
+ page.setSize(mgtShopOrderPageDto.getPageSize());
+ page.setCurrent(mgtShopOrderPageDto.getPageNum());
}
List<MgtShopOrderPageVo> shopOrderPageVoList = orderService.pageMgtShopOrder(page,mgtShopOrderPageDto);
ExcelUtil<MgtShopOrderPageVo> util = new ExcelUtil<MgtShopOrderPageVo>(MgtShopOrderPageVo.class);
@@ -161,10 +170,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);
}
--
Gitblit v1.7.1