diff --git a/src/main/java/com/yolo/keyborad/service/impl/KeyboardThemePurchaseServiceImpl.java b/src/main/java/com/yolo/keyborad/service/impl/KeyboardThemePurchaseServiceImpl.java index 2ebf088..9c0abe8 100644 --- a/src/main/java/com/yolo/keyborad/service/impl/KeyboardThemePurchaseServiceImpl.java +++ b/src/main/java/com/yolo/keyborad/service/impl/KeyboardThemePurchaseServiceImpl.java @@ -205,14 +205,14 @@ public class KeyboardThemePurchaseServiceImpl extends ServiceImpl getUserPurchasedThemes(Long userId) { - // 1. 查询用户所有已支付的主题ID列表 - List themeIds = this.lambdaQuery() - .eq(KeyboardThemePurchase::getUserId, userId) // 根据用户ID筛选 - .eq(KeyboardThemePurchase::getPayStatus, (short) 1) // 支付状态为1(已支付) + // 1. 从用户主题表查询主题ID列表 + List themeIds = userThemesService.lambdaQuery() + .eq(KeyboardUserThemes::getUserId, userId) + .eq(KeyboardUserThemes::getViewDeleted, false) .list() .stream() - .map(KeyboardThemePurchase::getThemeId) // 提取主题ID - .distinct() // 去重 + .map(KeyboardUserThemes::getThemeId) + .distinct() .collect(java.util.stream.Collectors.toList()); // 2. 如果没有购买记录,返回空列表