From b399737361f5215da04c39ab84afc749a3b53958 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Sun, 9 Nov 2025 12:43:16 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=B3=BB=E7=BB=9F=E6=8E=A8?= =?UTF-8?q?=E5=B9=BF=E8=B0=83=E4=BC=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/xkt/service/impl/WebsiteAPPServiceImpl.java | 8 ++++---- .../com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsiteAPPServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsiteAPPServiceImpl.java index 7ea31f11f..4f2a2347f 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsiteAPPServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsiteAPPServiceImpl.java @@ -129,7 +129,7 @@ public class WebsiteAPPServiceImpl implements IWebsiteAPPService { } else { // 从数据库查首页精选热卖推广（精准搜索是否存在推广，不存在从已过期的数据中拉数据来凑数） List advertRoundList = this.advertRoundMapper.selectList(new LambdaQueryWrapper() - .isNotNull(AdvertRound::getStoreId).isNotNull(AdvertRound::getProdIdStr).eq(AdvertRound::getDelFlag, Constants.UNDELETED) + .isNotNull(AdvertRound::getStoreId).isNotNull(AdvertRound::getProdIdStr).ne(AdvertRound::getProdIdStr, "").eq(AdvertRound::getDelFlag, Constants.UNDELETED) .eq(AdvertRound::getTypeId, AdType.APP_HOME_HOT_RECOMMEND_PROD.getValue()).eq(AdvertRound::getLaunchStatus, AdLaunchStatus.LAUNCHING.getValue()) .eq(AdvertRound::getBiddingStatus, AdBiddingStatus.BIDDING_SUCCESS.getValue())); if (CollectionUtils.isNotEmpty(advertRoundList)) { @@ -200,7 +200,7 @@ public class WebsiteAPPServiceImpl implements IWebsiteAPPService { } else { // 从数据库查首页 人气爆品 推广（精准搜索是否存在推广，不存在从已过期的数据中拉数据来凑数） List advertRoundList = this.advertRoundMapper.selectList(new LambdaQueryWrapper() - .isNotNull(AdvertRound::getStoreId).isNotNull(AdvertRound::getProdIdStr).eq(AdvertRound::getDelFlag, Constants.UNDELETED) + .isNotNull(AdvertRound::getStoreId).isNotNull(AdvertRound::getProdIdStr).ne(AdvertRound::getProdIdStr, "").eq(AdvertRound::getDelFlag, Constants.UNDELETED) .eq(AdvertRound::getTypeId, AdType.APP_HOME_POP_RECOMMEND_PROD.getValue()).eq(AdvertRound::getLaunchStatus, AdLaunchStatus.LAUNCHING.getValue()) .eq(AdvertRound::getBiddingStatus, AdBiddingStatus.BIDDING_SUCCESS.getValue())); if (CollectionUtils.isNotEmpty(advertRoundList)) { @@ -271,7 +271,7 @@ public class WebsiteAPPServiceImpl implements IWebsiteAPPService { } else { // 从数据库查首页 新品榜 推广（精准搜索是否存在推广，不存在从已过期的数据中拉数据来凑数） List advertRoundList = this.advertRoundMapper.selectList(new LambdaQueryWrapper() - .isNotNull(AdvertRound::getStoreId).isNotNull(AdvertRound::getProdIdStr).eq(AdvertRound::getDelFlag, Constants.UNDELETED) + .isNotNull(AdvertRound::getStoreId).isNotNull(AdvertRound::getProdIdStr).ne(AdvertRound::getProdIdStr, "").eq(AdvertRound::getDelFlag, Constants.UNDELETED) .eq(AdvertRound::getTypeId, AdType.APP_HOME_NEW_PROD_RECOMMEND_PROD.getValue()).eq(AdvertRound::getLaunchStatus, AdLaunchStatus.LAUNCHING.getValue()) .eq(AdvertRound::getBiddingStatus, AdBiddingStatus.BIDDING_SUCCESS.getValue())); if (CollectionUtils.isNotEmpty(advertRoundList)) { @@ -364,7 +364,7 @@ public class WebsiteAPPServiceImpl implements IWebsiteAPPService { } else { // 从数据库查首页 新品榜 推广（精准搜索是否存在推广，不存在从已过期的数据中拉数据来凑数） List advertRoundList = this.advertRoundMapper.selectList(new LambdaQueryWrapper() - .isNotNull(AdvertRound::getStoreId).isNotNull(AdvertRound::getProdIdStr).eq(AdvertRound::getDelFlag, Constants.UNDELETED) + .isNotNull(AdvertRound::getStoreId).isNotNull(AdvertRound::getProdIdStr).ne(AdvertRound::getProdIdStr, "").eq(AdvertRound::getDelFlag, Constants.UNDELETED) .eq(AdvertRound::getTypeId, AdType.APP_SEARCH_RESULT_PRODUCT.getValue()).eq(AdvertRound::getLaunchStatus, AdLaunchStatus.LAUNCHING.getValue()) .eq(AdvertRound::getBiddingStatus, AdBiddingStatus.BIDDING_SUCCESS.getValue())); if (CollectionUtils.isNotEmpty(advertRoundList)) { diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java index 7416737c6..23df71a9d 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java @@ -134,7 +134,7 @@ public class WebsitePCServiceImpl implements IWebsitePCService { } else { // 从数据库查首页 推荐商品 推广（精准搜索是否存在推广，不存在从已过期的数据中拉数据来凑数）而且必须是 竞价成功的推广（有可能当天有新的竞价推广还未正式审核通过） List advertRoundList = this.advertRoundMapper.selectList(new LambdaQueryWrapper() - .isNotNull(AdvertRound::getStoreId).isNotNull(AdvertRound::getProdIdStr).eq(AdvertRound::getDelFlag, Constants.UNDELETED) + .isNotNull(AdvertRound::getStoreId).isNotNull(AdvertRound::getProdIdStr).ne(AdvertRound::getProdIdStr, "").eq(AdvertRound::getDelFlag, Constants.UNDELETED) .eq(AdvertRound::getTypeId, AdType.PC_HOME_PRODUCT_LIST.getValue()).eq(AdvertRound::getLaunchStatus, AdLaunchStatus.LAUNCHING.getValue()) .eq(AdvertRound::getBiddingStatus, AdBiddingStatus.BIDDING_SUCCESS.getValue())); if (CollectionUtils.isNotEmpty(advertRoundList)) { @@ -217,7 +217,7 @@ public class WebsitePCServiceImpl implements IWebsitePCService { } else { // 从数据库查新品馆 推荐商品 推广（精准搜索是否存在推广，不存在从已过期的数据中拉数据来凑数） List advertRoundList = this.advertRoundMapper.selectList(new LambdaQueryWrapper() - .isNotNull(AdvertRound::getStoreId).isNotNull(AdvertRound::getProdIdStr).eq(AdvertRound::getDelFlag, Constants.UNDELETED) + .isNotNull(AdvertRound::getStoreId).isNotNull(AdvertRound::getProdIdStr).ne(AdvertRound::getProdIdStr, "").eq(AdvertRound::getDelFlag, Constants.UNDELETED) .eq(AdvertRound::getTypeId, AdType.PC_NEW_PROD_PRODUCT_LIST.getValue()).eq(AdvertRound::getLaunchStatus, AdLaunchStatus.LAUNCHING.getValue()) .eq(AdvertRound::getBiddingStatus, AdBiddingStatus.BIDDING_SUCCESS.getValue())); if (CollectionUtils.isNotEmpty(advertRoundList)) { @@ -305,7 +305,7 @@ public class WebsitePCServiceImpl implements IWebsitePCService { } else { // 从数据库查询搜索结果是否有广告（只查询现在正在播放的，不查询历史数据） List advertRoundList = this.advertRoundMapper.selectList(new LambdaQueryWrapper() - .isNotNull(AdvertRound::getStoreId).isNotNull(AdvertRound::getProdIdStr).eq(AdvertRound::getDelFlag, Constants.UNDELETED) + .isNotNull(AdvertRound::getStoreId).isNotNull(AdvertRound::getProdIdStr).ne(AdvertRound::getProdIdStr, "").eq(AdvertRound::getDelFlag, Constants.UNDELETED) .eq(AdvertRound::getTypeId, AdType.PC_SEARCH_RESULT_PRODUCT.getValue()).eq(AdvertRound::getLaunchStatus, AdLaunchStatus.LAUNCHING.getValue()) .eq(AdvertRound::getBiddingStatus, AdBiddingStatus.BIDDING_SUCCESS.getValue())); if (CollectionUtils.isNotEmpty(advertRoundList)) {