fix guild & mail
parent
35bc1e5322
commit
0ccb33b366
|
|
@ -207,11 +207,15 @@ public class MailLogic {
|
|||
if (mail == null){
|
||||
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
|
||||
}
|
||||
if(mail.getState() == Global.MAIL_DRAW_ST_GOT){
|
||||
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
|
||||
}
|
||||
if (mailItem.length() == 0){
|
||||
mailItem = new StringBuilder(mail.getMailItem());
|
||||
}else{
|
||||
mailItem.append("|").append(mail.getMailItem());
|
||||
}
|
||||
|
||||
}
|
||||
if(mailItem.length()==0){
|
||||
throw new ErrorCodeException(ErrorCode.MAIL_NO_REWARD);
|
||||
|
|
@ -223,9 +227,6 @@ public class MailLogic {
|
|||
}
|
||||
for (String mailId : mailIdsList){
|
||||
Mail mail = mailManager.getMail(mailId);
|
||||
if (mail == null){
|
||||
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
|
||||
}
|
||||
mail.setState(Global.MAIL_DRAW_ST_GOT);
|
||||
// mail.setMailItem("");
|
||||
mail.setNoUseDeleteTime(TimeUtils.now()+TimeUtils.DAY*Global.MAIL_NOUSE_DELETE_TIME);
|
||||
|
|
|
|||
|
|
@ -412,7 +412,7 @@ public class CBean2Proto {
|
|||
.setAnnouce(guildInfo.getAnnounce())
|
||||
.setName(guildInfo.getName())
|
||||
.setJoinType(guildInfo.getJoinType())
|
||||
.setMaxNum(30)
|
||||
.setMaxNum(STableManager.getConfig(SGuildLevelConfig.class).get(guildInfo.getLevel()).getNum())
|
||||
.setLevelTime(guildInfo.getLevelTime())
|
||||
.setLevle(guildInfo.getLevel())
|
||||
.setExp(guildInfo.getExp())
|
||||
|
|
|
|||
Loading…
Reference in New Issue