修改bug

puzhibing

2023-12-13 1772afb069b75871572c9c438bbd2bc403f864df

 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;

@@ -117,13 +118,15 @@
        Long userId = SecurityUtils.getUserId();
        mgtShopOrderPageDto.setUserId(userId);
        Page<MgtActivityOrderPageVo> page = new Page<>();
        if(mgtShopOrderPageDto.getPageSize() > 5000){
            page.setSize(5000);
//        if(mgtShopOrderPageDto.getPageSize() > 5000){
//            page.setSize(5000);
//            page.setCurrent(1);
//        }else{
//            page.setSize(mgtShopOrderPageDto.getPageSize());
//            page.setCurrent(mgtShopOrderPageDto.getPageNum());
//        }
        page.setSize(Integer.MAX_VALUE);
            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);
        util.exportExcel(response, mgtActivityOrderPageVos, "秒杀订单列表");
@@ -147,13 +150,8 @@
        Long userId = SecurityUtils.getUserId();
        mgtShopOrderPageDto.setUserId(userId);
        Page<MgtShopOrderPageVo> page = new Page<>();
        if(mgtShopOrderPageDto.getPageSize() > 5000){
            page.setSize(5000);
        page.setSize(Integer.MAX_VALUE);
            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);
        util.exportExcel(response, shopOrderPageVoList, "门店订单列表");