瀏覽代碼

修复店铺列表页面获取不在有效期内活动问题;

codingliang 1 年之前
父節點
當前提交
239479b7bc
共有 1 個文件被更改,包括 6 次插入1 次删除
  1. 6 1
      src/main/java/com/sqx/modules/activity/service/impl/ActivityShopServiceImpl.java

+ 6 - 1
src/main/java/com/sqx/modules/activity/service/impl/ActivityShopServiceImpl.java

@@ -178,7 +178,12 @@ public class ActivityShopServiceImpl extends ServiceImpl<ActivityShopDao, Activi
 
     @Override
     public List<ShopActivityVO> getActivityByShopIds(List<Long> shopIds) {
-        return baseMapper.getActivityByShopIds(shopIds);
+        List<ShopActivityVO> activityByShopIds = baseMapper.getActivityByShopIds(shopIds);
+
+        Date currentDate = new Date();
+        return activityByShopIds.stream()
+                .filter(e -> currentDate.after(e.getStartTime()) && currentDate.before(e.getEndTime()))
+                .collect(Collectors.toList());
     }
 
     @Override