修改bug

Pu Zhibing

10 小时以前 bf7ebe760405f3ab1977b015fc8e4c7a642e1871

修改bug

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLotteryEventController.java

@@ -80,6 +80,7 @@
        if (LocalDateTime.now().isAfter(event.getStartTime()) && LocalDateTime.now().isBefore(event.getEndTime())) {
            lotteryEvent.setStatus(2);
        }
        lotteryEvent.setIsDelete(event.getDelFlag());
        return R.ok(lotteryEvent);
    }
    

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/LotteryEventVo.java

@@ -31,4 +31,6 @@
    private List<UserLotteryEventVo> yourPrizeList;
    @ApiModelProperty("抽奖状态（1=未开始，2=进行中，3=已结束）")
    private Integer status;
    @ApiModelProperty("抽奖状态（1=未开始，2=进行中，3=已结束）")
    private Integer isDelete;
}

 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, "秒杀订单列表", "秒杀订单列表");
    }

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java

@@ -4020,9 +4020,10 @@
            mgtShopOrderPageDto.setShopIds(shopIds);
        }


        System.err.println("查询条件：" + JSON.toJSONString(mgtShopOrderPageDto));
        // 从数据库中获取活动订单列表
        List<MgtActivityOrderPageVo> activityOrderPageVoList = orderMapper.pageMgtActivityOrder(page, mgtShopOrderPageDto);
        System.err.println("查询导出数据条数：" + activityOrderPageVoList.size());
        // 如果列表不为空
        if (!activityOrderPageVoList.isEmpty()) {
            // 定义变量