From 3d8a84126d1aaf302e269f2da41c978d1c2e5f73 Mon Sep 17 00:00:00 2001
From: liyj <1617420630@qq.com>
Date: Mon, 17 Nov 2025 17:52:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=9F=A5=E8=AF=A2=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E8=BF=87=E6=9C=9F=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ShopProductBaseServiceImpl.java      | 38 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java
index e9b944f4..2fc346e5 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java
@@ -2060,7 +2060,11 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl<ShopProductBaseM
                 }
             }
 
-            List<ShopProductIndex> productIndexList = shopProductIndexService.gets(product_id_row);
+            //List<ShopProductIndex> productIndexList = shopProductIndexService.gets(product_id_row);
+            //过滤过期的活动商品 start
+            List<ShopProductIndex> productIndexList = filterEndActivity(product_id_row);
+            //过滤过期的活动商品 end
+
             List<Map> product_index_rows = Convert.toList(Map.class, productIndexList);
             List<Map> product_info_rows = Convert.toList(Map.class, shopProductInfoService.gets(product_id_row));
 
@@ -6572,5 +6576,37 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl<ShopProductBaseM
         return data;
     }
 
+    /**
+     * 过期活动不需要显示关键字
+     * @param product_id_row
+     * @return
+     */
+    private List<ShopProductIndex> filterEndActivity(List<Long> product_id_row){
+        List<ShopProductIndex> productIndexList = shopProductIndexService.gets(product_id_row);
+        List<Long> hasActivityProductIds=productIndexList.stream().
+                filter(shopProductIndex -> com.suisung.mall.common.utils.StringUtils.isNotEmpty(shopProductIndex.getActivity_type_ids()))
+                .map(ShopProductIndex::getProduct_id )
+                .collect(Collectors.toList());
+        if(hasActivityProductIds.isEmpty()){
+            return productIndexList;
+        }
+        //过滤过期的活动商品 start
+        QueryWrapper<ShopStoreActivityItem> queryWrapper = new QueryWrapper<>();
+        List<Long> productIds=productIndexList.stream().map(ShopProductIndex::getProduct_id).collect(Collectors.toList());
+        queryWrapper.in("product_id", productIds);
+        queryWrapper.eq("activity_item_state",StateCode.ACTIVITY_STATE_NORMAL);
+        List<ShopStoreActivityItem> shopStoreActivityItems= shopStoreActivityItemService.list(queryWrapper);
+        Map<Long,Integer> activityNomalMap=new HashMap<>();
+        shopStoreActivityItems.forEach(shopStoreActivityItem -> {
+            activityNomalMap.put(shopStoreActivityItem.getProduct_id(),shopStoreActivityItem.getActivity_id());
+        });
+        productIndexList=productIndexList.stream().peek(shopProductIndex -> {
+            if(null==activityNomalMap.get(shopProductIndex.getProduct_id())){
+                shopProductIndex.setActivity_type_ids("");
+            }
+        }).collect(Collectors.toList());
+        //过滤过期的活动商品 end
+        return productIndexList;
+    }
 
 }