From 40d3bb9fe638a0bd79e829e7fd5114871101390b Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 20 十一月 2025 10:52:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeActivityServiceImpl.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeActivityServiceImpl.java
index 4351b3d..51227cb 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeActivityServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeActivityServiceImpl.java
@@ -49,6 +49,7 @@
PrizeActivity prizeActivity = new LambdaQueryChainWrapper<>(baseMapper)
.eq(PrizeActivity::getDeleteFlag,Boolean.FALSE)
.eq(PrizeActivity::getEnableStatus,PrizeActivityStatusEnum.ON.name())
+ .eq(PrizeActivity::getPopup,Boolean.TRUE)
.one();
PrizeActivityVO prizeActivityVO = new PrizeActivityVO();
if (prizeActivity != null){
@@ -66,6 +67,7 @@
PrizeActivity prizeActivity = new LambdaQueryChainWrapper<>(baseMapper)
.eq(PrizeActivity::getDeleteFlag,Boolean.FALSE)
.eq(PrizeActivity::getPopup,Boolean.TRUE)
+ .eq(PrizeActivity::getEnableStatus,PrizeActivityStatusEnum.ON.name())
.one();
PrizeActivityVO prizeActivityVO = new PrizeActivityVO();
if (prizeActivity != null){
--
Gitblit v1.8.0