diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java index 864fd59b0..680a105b5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java @@ -625,7 +625,7 @@ public class GuildLogic { } targetUser.getGuildMyInfo().setJoinTime(TimeUtils.nowInt()); ReportUtil.onReportEvent(targetUser, ReportEventEnum.JOIN_GUILD.getType(),String.valueOf(guildInfo.getId()),guildInfo.getName(),guildInfo.getLevel(),guildInfo.getTotalMembers()); - sendNewGuyRedPacket(guildInfo); + sendNewGuyRedPacket(guildInfo,applyId); } /** @@ -1715,18 +1715,18 @@ public class GuildLogic { return true; } - private static void sendNewGuyRedPacket(GuildInfo guildInfo) throws Exception{ + private static void sendNewGuyRedPacket(GuildInfo guildInfo,int userId) throws Exception{ for(int id : guildInfo.getMembers().get(GlobalsDef.CHAIRMAN)){ - User user = UserManager.getUser(id); - if(user == null) + User chairman = UserManager.getUser(id); + if(chairman == null) continue; - if(guildInfo.getHistoryMember().contains(user.getId())){ + if(guildInfo.getHistoryMember().contains(userId)){ return; }else{ - guildInfo.getHistoryMember().add(user.getId()); + guildInfo.getHistoryMember().add(userId); guildInfo.updateHistoryMember(); } - Poster.getPoster().dispatchEvent(new WelfareRedPackEvent(user.getId(), WelfareRedPacketType.newfish_come.getType(),0)); + Poster.getPoster().dispatchEvent(new WelfareRedPackEvent(chairman.getId(), WelfareRedPacketType.newfish_come.getType(),0)); } }