diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/UserToggleBadgeCmdExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/UserToggleBadgeCmdExe.java index 48dfffaa..7fd83134 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/UserToggleBadgeCmdExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/UserToggleBadgeCmdExe.java @@ -17,10 +17,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; import java.math.BigDecimal; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -47,10 +44,7 @@ public class UserToggleBadgeCmdExe { // 查询当前已佩戴的徽章 - LambdaQueryWrapper eq = Wrappers.lambdaQuery(BadgeBackpack.class) - .eq(BadgeBackpack::getUserId, userId) - .eq(BadgeBackpack::getUseProps, Boolean.TRUE); - List currentWearBadges = badgeBackpackService.list(eq); + List currentWearBadges = badgeBackpackService.listUseNotExpireTimeByUserIds(new HashSet<>(Collections.singletonList(userId))); // 检查目标徽章是否已佩戴 boolean isWearing = currentWearBadges.stream()