diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/common/team/decay/TeamMemberRemoveDecay.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/common/team/decay/TeamMemberRemoveDecay.java index aad8950d..17db1a0f 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/common/team/decay/TeamMemberRemoveDecay.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/common/team/decay/TeamMemberRemoveDecay.java @@ -33,7 +33,6 @@ import com.red.circle.other.inner.enums.team.TeamApplicationType; import com.red.circle.other.inner.enums.team.TeamMemberRole; import com.red.circle.tool.core.collection.CollectionUtils; import com.red.circle.tool.core.date.TimestampUtils; -import com.red.circle.tool.core.date.ZonedDateTimeAsiaRiyadhUtils; import com.red.circle.tool.core.sequence.IdWorkerUtils; import com.red.circle.wallet.inner.endpoint.wallet.WalletGoldClient; import com.red.circle.wallet.inner.model.cmd.GoldReceiptCmd; @@ -183,7 +182,7 @@ public class TeamMemberRemoveDecay { if (!redisService.lock(lockKey, 60)) { return null; } - TeamMember teamMember = teamMemberService.removeMemberBySortId(memberSortId); + TeamMember teamMember = teamMemberService.removeMember(memberSortId); if (Objects.isNull(teamMember)) { redisService.unlock(lockKey); return null; diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/common/team/decay/UpdateMemberTeamDecay.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/common/team/decay/UpdateMemberTeamDecay.java index 4ede7164..5b57480a 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/common/team/decay/UpdateMemberTeamDecay.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/common/team/decay/UpdateMemberTeamDecay.java @@ -194,7 +194,7 @@ public class UpdateMemberTeamDecay { if (!redisService.lock(lockKey, 60)) { return null; } - TeamMember teamMember = teamMemberService.removeMemberBySortId(memberSortId); + TeamMember teamMember = teamMemberService.removeMember(memberSortId); if (Objects.isNull(teamMember)) { redisService.unlock(lockKey); return null; diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/TeamMemberService.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/TeamMemberService.java index 3113dc9f..bf4a1b24 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/TeamMemberService.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/TeamMemberService.java @@ -100,7 +100,7 @@ public interface TeamMemberService { /** * 移除团队成员. */ - TeamMember removeMemberBySortId(Long sortId); + TeamMember removeMember(Long memberId); /** * 移除房间成员. diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/impl/TeamMemberServiceImpl.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/impl/TeamMemberServiceImpl.java index bd1c0e52..c8428810 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/impl/TeamMemberServiceImpl.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/impl/TeamMemberServiceImpl.java @@ -175,8 +175,8 @@ public class TeamMemberServiceImpl implements TeamMemberService { } @Override - public TeamMember removeMemberBySortId(Long sortId) { - return mongoTemplate.findAndRemove(Query.query(Criteria.where("sortId").in(sortId)), + public TeamMember removeMember(Long sortId) { + return mongoTemplate.findAndRemove(Query.query(Criteria.where("memberId").in(sortId)), TeamMember.class); }