fix activity
parent
d750f4a5d4
commit
48be1a6fe6
|
@ -29,6 +29,7 @@ public interface ActivityType {
|
||||||
int FORCESTANDARD = 12;//战力达标
|
int FORCESTANDARD = 12;//战力达标
|
||||||
int DAILY_RECHARGE = 13;//每日充值
|
int DAILY_RECHARGE = 13;//每日充值
|
||||||
int RECHARGE_SUM_DAY = 14;//累计充值天数
|
int RECHARGE_SUM_DAY = 14;//累计充值天数
|
||||||
|
int EXCHANGEANDDROP = 15;//限时兑换活动
|
||||||
int SECURT_EXPERT = 16;// 秘境达人
|
int SECURT_EXPERT = 16;// 秘境达人
|
||||||
int ARENA_EXPERT = 17;// 竞技达人
|
int ARENA_EXPERT = 17;// 竞技达人
|
||||||
int UP_EXPERT = 18;// 进阶达人
|
int UP_EXPERT = 18;// 进阶达人
|
||||||
|
@ -40,7 +41,4 @@ public interface ActivityType {
|
||||||
int RECHARGE_NUM = 24;//累计充值
|
int RECHARGE_NUM = 24;//累计充值
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// int EXCHANGEANDDROP = 15;//限时兑换活动
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,6 +21,7 @@ public enum ActivityTypeEnum {
|
||||||
FORCESTANDARD(ActivityType.FORCESTANDARD, ForceStandardActivity::new),
|
FORCESTANDARD(ActivityType.FORCESTANDARD, ForceStandardActivity::new),
|
||||||
DAILY_RECHARGE(ActivityType.DAILY_RECHARGE, DailyRechargeActivity::new),
|
DAILY_RECHARGE(ActivityType.DAILY_RECHARGE, DailyRechargeActivity::new),
|
||||||
RECHARGE_SUM(ActivityType.RECHARGE_SUM_DAY, RechargeSumDayActivity::new),
|
RECHARGE_SUM(ActivityType.RECHARGE_SUM_DAY, RechargeSumDayActivity::new),
|
||||||
|
EXCHANGEANDDROP(ActivityType.EXCHANGEANDDROP, DefaultEmptyActivity::new),
|
||||||
SECURT_EXPERT(ActivityType.SECURT_EXPERT, SecretExpectRankActivity::new),
|
SECURT_EXPERT(ActivityType.SECURT_EXPERT, SecretExpectRankActivity::new),
|
||||||
ARENA_EXPERT(ActivityType.ARENA_EXPERT, AreanaExpectRankActivity::new),
|
ARENA_EXPERT(ActivityType.ARENA_EXPERT, AreanaExpectRankActivity::new),
|
||||||
UP_EXPERT(ActivityType.UP_EXPERT, HeroUpExpectRankActivity::new),
|
UP_EXPERT(ActivityType.UP_EXPERT, HeroUpExpectRankActivity::new),
|
||||||
|
|
|
@ -52,8 +52,11 @@ public class MailLogic {
|
||||||
return mailList;
|
return mailList;
|
||||||
}
|
}
|
||||||
List<Mail> cMailList = new CopyOnWriteArrayList<>();
|
List<Mail> cMailList = new CopyOnWriteArrayList<>();
|
||||||
for (Map.Entry<String,Mail> entry :mailMap.entrySet()){
|
Iterator<Map.Entry<String, Mail>> iterator = mailMap.entrySet().iterator();
|
||||||
Mail cMail = entry.getValue();
|
|
||||||
|
while (iterator.hasNext()){
|
||||||
|
Map.Entry<String, Mail> next = iterator.next();
|
||||||
|
Mail cMail = next.getValue();
|
||||||
int nowTime = (int)(TimeUtils.now()/1000);
|
int nowTime = (int)(TimeUtils.now()/1000);
|
||||||
if (cMail.getEffectiveTime() != 0 && (nowTime - cMail.getSendTime()) > cMail.getEffectiveTime()){
|
if (cMail.getEffectiveTime() != 0 && (nowTime - cMail.getSendTime()) > cMail.getEffectiveTime()){
|
||||||
mailManager.removeMail(cMail.getId());
|
mailManager.removeMail(cMail.getId());
|
||||||
|
|
Loading…
Reference in New Issue