From e4eaabefaaa2ca95f809c47a11712c3bee56e1b5 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期四, 20 二月 2025 15:07:09 +0800
Subject: [PATCH] 修改物流信息导入模板

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BannerController.java |    9 +++------
 1 files changed, 3 insertions(+), 6 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..bb11d0c 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
@@ -75,20 +75,17 @@
                 Goods goods = goodsService.getById(banner.getContent());
                 if(null == goods || goods.getDelFlag() == 1){
                     banner.setJumpType(1);
-                }
-                if(!goods.getCommodityAuthority().contains("-1") && !goods.getCommodityAuthority().contains(vipId.toString())){
+                } else if(!goods.getCommodityAuthority().contains("-1") && !goods.getCommodityAuthority().contains(vipId.toString())){
                     banner.setJumpType(1);
                 }
             }
             //秒杀活动
             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