From a5c5fc7c86c37519dbe42b148b47ebfc00f89ca9 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 09 七月 2025 10:56:42 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 d9047dd..d8c41c3 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
@@ -265,6 +265,8 @@
.eq(TLotteryEvent::getActivityType, dto.getActivityType())//类型相同的
.between(TLotteryEvent::getStartTime, dto.getStartTime(), dto.getEndTime())//开始时间在这个活动的（开始-结束）范围内的
.or()
+ .eq(TLotteryEvent::getDelFlag, 0)//未删除的
+ .eq(TLotteryEvent::getActivityType, dto.getActivityType())//类型相同的
.between(TLotteryEvent::getEndTime, dto.getStartTime(), dto.getEndTime())//结束时间在这个活动的（开始-结束）范围内的
);
if (null != lotteryEvents && !lotteryEvents.isEmpty()) {
@@ -398,10 +400,11 @@
page.setCurrent(dto.getPageNum());
page.setPages(total/dto.getPageSize());
//获取分页信息
+ dto.setOffset((dto.getPageNum() - 1) * dto.getPageSize());
List<MgtLotteryEventPageVo> voList = this.baseMapper.pageMgtLotteryEvent(dto);
//填充创建对象
voList.forEach(x->{
- if (x.getActivityType()!=6){
+ if (null == x.getShopId()){
x.setCreateObject("平台创建");
}else {
//线下抽奖，获取门店名称
@@ -481,6 +484,7 @@
//1.奖品数据删除
/* lotteryEventPrizeService.remove(new LambdaQueryWrapper<TLotteryEventPrize>()
.eq(TLotteryEventPrize::getLotteryEventId,lotteryEvent.getId()));*/
+
lotteryEventPrizeService.deleteByLotteryEventId(lotteryEvent.getId());
//2.答题类型
if (lotteryEvent.getActivityType().equals(5)) {
--
Gitblit v1.7.1