|
|
@@ -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
|