From a1291473696d00948a910c06e9060b8af62f8e4d Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Mon, 8 Sep 2025 16:10:12 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=B3=BB=E7=BB=9F=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/ry_20240629.sql | 3 +++ .../com/ruoyi/xkt/service/impl/UserFavoritesServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sql/ry_20240629.sql b/sql/ry_20240629.sql index 140cc4e1f..a74781b0e 100644 --- a/sql/ry_20240629.sql +++ b/sql/ry_20240629.sql @@ -2119,6 +2119,9 @@ VALUES (1089, 34, '2025年夏季', '2025年夏季', 'release_year_season', '0', INSERT INTO `sys_dict_data` VALUES (1090, 35, '2025年秋季', '2025年秋季', 'release_year_season', '0', 'admin', '2025-08-03 20:57:32', '', '2025-08-03 20:57:32', '', 0, '0'); +INSERT INTO `sys_dict_data` +VALUES (1092, 37, '2025年冬季', '2025年冬季', 'release_year_season', '0', 'admin', '2025-09-01 03:00:00', '', + '2025-09-01 03:00:00', NULL, 0, '0'); -- ---------------------------- 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 5a04f4c74..b08a1fd1a 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 @@ -180,7 +180,7 @@ public class UserFavoritesServiceImpl implements IUserFavoritesService { // 找到当前商品的颜色 List prodColorList = this.prodColorMapper.selectList(new LambdaQueryWrapper() .in(StoreProductColor::getStoreProdId, notAddList.stream().map(UserFavBatchAddToShopCartDTO.BatchDTO::getStoreProdId).collect(Collectors.toList())) - .in(StoreProductColor::getProdStatus, Arrays.asList(EProductStatus.ON_SALE.getValue(), EProductStatus.TAIL_GOODS.getValue())) + .in(StoreProductColor::getProdStatus, Collections.singletonList(EProductStatus.ON_SALE.getValue())) .eq(StoreProductColor::getDelFlag, Constants.UNDELETED)); // 按照storeProdId分组，若商品有多个颜色则任取其一 Map prodColorMap = prodColorList.stream().collect(Collectors.toMap(StoreProductColor::getStoreProdId, Function.identity(), (x, y) -> x));