From 0f71ac509e998b2af638f6a0a855aab673fe61d9 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Thu, 18 Sep 2025 22:34:43 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=94=A8=E6=88=B7=E6=94=B6?= =?UTF-8?q?=E8=97=8F=E5=95=86=E5=93=81=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/UserFavoritesServiceImpl.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserFavoritesServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserFavoritesServiceImpl.java index 2b19c04fe..76e5469d3 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserFavoritesServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserFavoritesServiceImpl.java @@ -73,22 +73,24 @@ public class UserFavoritesServiceImpl implements IUserFavoritesService { // 已经加入购物车的商品 final List existStoreProdIdList = CollectionUtils.isNotEmpty(existList) ? existList.stream().map(UserFavorites::getStoreProdId).collect(Collectors.toList()) : new ArrayList<>(); - // 购物车列表 - List list = favoriteDTO.getBatchList().stream() - .filter(x -> CollectionUtils.isNotEmpty(existStoreProdIdList) ? !existStoreProdIdList.contains(x.getStoreProdId()) : Boolean.TRUE) + List unFavList = favoriteDTO.getBatchList().stream() + .filter(x -> CollectionUtils.isEmpty(existStoreProdIdList) || !existStoreProdIdList.contains(x.getStoreProdId())) .map(x -> BeanUtil.toBean(x, UserFavorites.class).setUserId(loginUser.getUserId())) .collect(Collectors.toList()); - int count = this.userFavMapper.insert(list).size(); + if (CollectionUtils.isEmpty(unFavList)) { + return 0; + } + int count = this.userFavMapper.insert(unFavList).size(); Map storeMap = this.storeMapper.selectList(new LambdaQueryWrapper() - .in(Store::getId, list.stream().map(UserFavorites::getStoreId).collect(Collectors.toList())) + .in(Store::getId, unFavList.stream().map(UserFavorites::getStoreId).collect(Collectors.toList())) .eq(Store::getDelFlag, Constants.UNDELETED)).stream() .collect(Collectors.toMap(Store::getId, Function.identity())); Map storeProdMap = this.storeProdMapper.selectList(new LambdaQueryWrapper() - .in(StoreProduct::getId, list.stream().map(UserFavorites::getStoreProdId).collect(Collectors.toList())) + .in(StoreProduct::getId, unFavList.stream().map(UserFavorites::getStoreProdId).collect(Collectors.toList())) .eq(StoreProduct::getDelFlag, Constants.UNDELETED)).stream() .collect(Collectors.toMap(StoreProduct::getId, Function.identity())); // 新增用户收藏商品通知 - list.forEach(userFav -> { + unFavList.forEach(userFav -> { StoreProduct storeProd = storeProdMap.get(userFav.getStoreProdId()); Store store = storeMap.get(userFav.getStoreId()); // 新增用户收藏商品消息通知