diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/ShoppingCartServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/ShoppingCartServiceImpl.java index a7f2a6173..7cd9c12fb 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/ShoppingCartServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/ShoppingCartServiceImpl.java @@ -122,7 +122,7 @@ public class ShoppingCartServiceImpl implements IShoppingCartService { .toMap(x -> x.getStoreProdId().toString() + x.getStoreColorId().toString() + x.getSize(), x -> x)); // 当前商品所有标准尺码 Map prodStandardSizeMap = priceSizeList.stream() - .filter(x -> Objects.equals(x.getStandard(), 1)) + .filter(x -> Objects.equals(x.getStandard(), ProductSizeStatus.STANDARD.getValue())) .collect(Collectors.groupingBy(StoreProductColorSize::getStoreProdId, Collectors .collectingAndThen(Collectors.mapping(StoreProductColorSize::getSize, Collectors.toSet()), sizes -> sizes.stream().sorted().map(String::valueOf).collect(Collectors.joining(","))))); 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 76e5469d3..e5d6e4330 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 @@ -134,20 +134,12 @@ public class UserFavoritesServiceImpl implements IUserFavoritesService { .in(StoreProductColorSize::getStoreProdId, favoriteList.stream().map(UserFavoritePageResDTO::getStoreProdId).collect(Collectors.toList())) .eq(StoreProductColorSize::getDelFlag, Constants.UNDELETED) .eq(StoreProductColorSize::getStandard, ProductSizeStatus.STANDARD.getValue())); - // 以storeProdId为key, 取标准尺码的最大值和最小值组成字符串 eg: 34 - 40 - Map minAndMaxSizeMap = standardSizeList.stream().collect(Collectors.groupingBy( - StoreProductColorSize::getStoreProdId, - Collectors.collectingAndThen( - Collectors.mapping(StoreProductColorSize::getSize, Collectors.toList()), - sizeList -> { - if (sizeList.isEmpty()) { - return ""; // 处理空列表的情况,返回空字符串或其他默认值 - } - int minSize = Collections.min(sizeList); - int maxSize = Collections.max(sizeList); - return minSize + "-" + maxSize; - }))); - favoriteList.forEach(x -> x.setStandardSize(minAndMaxSizeMap.getOrDefault(x.getStoreProdId(), "")) + // 当前商品所有标准尺码 + Map prodStandardSizeMap = standardSizeList.stream() + .collect(Collectors.groupingBy(StoreProductColorSize::getStoreProdId, Collectors + .collectingAndThen(Collectors.mapping(StoreProductColorSize::getSize, Collectors.toSet()), + sizes -> sizes.stream().sorted().map(String::valueOf).collect(Collectors.joining(","))))); + favoriteList.forEach(x -> x.setStandardSize(prodStandardSizeMap.getOrDefault(x.getStoreProdId(), "")) .setMainPicUrl(mainPicMap.getOrDefault(x.getStoreProdId(), null)) .setPrice(prodMinPriceMap.getOrDefault(x.getStoreProdId(), null))); return Page.convert(new PageInfo<>(favoriteList));