Merge branch 'master_test_gn_zf' of http://60.1.1.230/backend/jieling_server into master_test_gn_zf
commit
fb6166b202
|
@ -444,10 +444,13 @@ public class ChampionshipLogic {
|
||||||
costs[0] = new int[2];
|
costs[0] = new int[2];
|
||||||
costs[0][0] = arenaItemId;
|
costs[0][0] = arenaItemId;
|
||||||
costs[0][1] = itemNum;
|
costs[0][1] = itemNum;
|
||||||
|
// Map<Integer, Long> itemReward = new HashMap<>(1);
|
||||||
|
// itemReward.put(rewardItemId, (long) (itemNum / sChampionshipSetting.getExchangeItem()));
|
||||||
|
String title = SErrorCodeEerverConfig.getI18NMessage("champion_bet_title");
|
||||||
|
String content = SErrorCodeEerverConfig.getI18NMessage("champion_bet_content");
|
||||||
|
MailLogic.getInstance().sendMail(user.getId(),title,content,rewardItemId+"#"+(itemNum / sChampionshipSetting.getExchangeItem()),TimeUtils.nowInt(),Global.MAIL_EFFECTIVE_TIME);
|
||||||
ItemUtil.itemCost(user, costs, BIReason.CHAMPIONM_EXCHANGE_CONSUME, sendId);
|
ItemUtil.itemCost(user, costs, BIReason.CHAMPIONM_EXCHANGE_CONSUME, sendId);
|
||||||
Map<Integer, Long> itemReward = new HashMap<>(1);
|
// ItemUtil.addItem(user, itemReward, null, BIReason.CHAMPIONM_EXCHANGE_REWARD);
|
||||||
itemReward.put(rewardItemId, (long) (itemNum / sChampionshipSetting.getExchangeItem()));
|
|
||||||
ItemUtil.addItem(user, itemReward, null, BIReason.CHAMPIONM_EXCHANGE_REWARD);
|
|
||||||
}
|
}
|
||||||
LOGGER.info("the uid={},send rewardnum={}", itemNum / sChampionshipSetting.getExchangeItem());
|
LOGGER.info("the uid={},send rewardnum={}", itemNum / sChampionshipSetting.getExchangeItem());
|
||||||
|
|
||||||
|
|
|
@ -625,7 +625,7 @@ public class GuildLogic {
|
||||||
}
|
}
|
||||||
targetUser.getGuildMyInfo().setJoinTime(TimeUtils.nowInt());
|
targetUser.getGuildMyInfo().setJoinTime(TimeUtils.nowInt());
|
||||||
ReportUtil.onReportEvent(targetUser, ReportEventEnum.JOIN_GUILD.getType(),String.valueOf(guildInfo.getId()),guildInfo.getName(),guildInfo.getLevel(),guildInfo.getTotalMembers());
|
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;
|
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)){
|
for(int id : guildInfo.getMembers().get(GlobalsDef.CHAIRMAN)){
|
||||||
User user = UserManager.getUser(id);
|
User chairman = UserManager.getUser(id);
|
||||||
if(user == null)
|
if(chairman == null)
|
||||||
continue;
|
continue;
|
||||||
if(guildInfo.getHistoryMember().contains(user.getId())){
|
if(guildInfo.getHistoryMember().contains(userId)){
|
||||||
return;
|
return;
|
||||||
}else{
|
}else{
|
||||||
guildInfo.getHistoryMember().add(user.getId());
|
guildInfo.getHistoryMember().add(userId);
|
||||||
guildInfo.updateHistoryMember();
|
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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue