From 761136cf5581dd5905ae2b7174ff9958c11a19bd Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 16 一月 2025 16:35:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java
index bd3ec88..16ca460 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java
@@ -83,12 +83,10 @@
//秒杀活动
if(null != jumpType1 && 4 == jumpType1){
SeckillActivityInfo activityInfo = seckillActivityInfoService.getById(banner.getContent());
- if(null == activityInfo || activityInfo.getDelFlag() == 1){
+ if(null == activityInfo || activityInfo.getDelFlag() == 1 || !activityInfo.getVipIds().contains(vipId.toString())){
banner.setJumpType(1);
}
- if(!activityInfo.getVipIds().contains(vipId.toString())){
- banner.setJumpType(1);
- }
+
}
}
return R.ok(list);
--
Gitblit v1.7.1