master:系统优化;

pull/1121/head
liujiang 2025-09-08 16:10:12 +08:00
parent 3b589f84ac
commit a129147369
2 changed files with 4 additions and 1 deletions

View File

@ -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');
-- ----------------------------

View File

@ -180,7 +180,7 @@ public class UserFavoritesServiceImpl implements IUserFavoritesService {
// 找到当前商品的颜色
List<StoreProductColor> prodColorList = this.prodColorMapper.selectList(new LambdaQueryWrapper<StoreProductColor>()
.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<Long, StoreProductColor> prodColorMap = prodColorList.stream().collect(Collectors.toMap(StoreProductColor::getStoreProdId, Function.identity(), (x, y) -> x));