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-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java
index 3fa41a3..f0294cb 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java
@@ -364,9 +364,14 @@
}
@Override
- public List<MgtLotteryEventPageVo> pageMgtLotteryEvent(Page<MgtLotteryEventPageVo> page, MgtLotteryEventPageDto dto) {
+ public Page<MgtLotteryEventPageVo> pageMgtLotteryEvent( MgtLotteryEventPageDto dto) {
Map<Long,Shop> map;
List<Shop> shopList;
+ Page<MgtLotteryEventPageVo> page = new Page<>();
+ page.setSize(dto.getPageSize());
+ page.setCurrent(dto.getPageNum());
+ page.setOptimizeCountSql(false);
+
if (dto.getCreateObject()!=null){
//根据 条件-创建对象 模糊查找门店集合
shopList=remoteShopService.getShopListByShopName(dto.getCreateObject());
@@ -385,9 +390,13 @@
} else {
map = new HashMap<>();
}
-
+ //获取分页数据
+ Long total=this.baseMapper.pageMgtLotteryEventCount( dto);
+ page.setTotal(total);
+ page.setCurrent(dto.getPageNum());
+ page.setPages(total/dto.getPageSize());
//获取分页信息
- List<MgtLotteryEventPageVo> voList = this.baseMapper.pageMgtLotteryEvent(page, dto);
+ List<MgtLotteryEventPageVo> voList = this.baseMapper.pageMgtLotteryEvent(dto);
//填充创建对象
voList.forEach(x->{
if (x.getActivityType()!=6){
@@ -406,7 +415,8 @@
}
});
- return voList;
+ page.setRecords(voList);
+ return page;
}
@Override
--
Gitblit v1.7.1