zhangshanxue 2019-09-28 21:48:27 +08:00
parent 72d36d633f
commit 1e4275aed1
1 changed files with 19 additions and 5 deletions

View File

@ -97,7 +97,13 @@ public class ActivityLogic {
if (endTime != 0 && now > endTime) {
if (openActivityIds.contains(sGlobalActivity.getId())) {
openActivityIds.remove(sGlobalActivity.getId());
ActivityTypeEnum.getActicityType(sGlobalActivity.getId()).onActivityEnd();
AbstractActivity abstractActivity = ActivityTypeEnum.getActicityType(sGlobalActivity.getId());
if (null == abstractActivity) {
continue;
}
abstractActivity.onActivityEnd();
}
continue;
}
@ -159,7 +165,7 @@ public class ActivityLogic {
activityManager.initAllActivityMission(openActivityId);
}
AbstractActivity abstractActivity = ActivityTypeEnum.getActicityType(openActivityId);
if (abstractActivity == null) {
if (null==abstractActivity) {
continue;
}
abstractActivity.initActivity(user);
@ -188,7 +194,11 @@ public class ActivityLogic {
if (endTime != 0 && now > endTime) {
ActivityMission activityMission = activityMissionMap.get(activityId);
if (activityMission != null) {
ActivityTypeEnum.getActicityType(sGlobalActivity.getId()).onActivityEndSelfWithDealReward(user);
AbstractActivity abstractActivity = ActivityTypeEnum.getActicityType(sGlobalActivity.getId());
if (null==abstractActivity) {
continue;
}
abstractActivity .onActivityEndSelfWithDealReward(user);
activityManager.removeActivity(activityId);
LOGGER.info("the uid={},remove the activity id ={}", user.getId(), activityId);
if (builder != null) {
@ -209,7 +219,11 @@ public class ActivityLogic {
} else {
ActivityMission activityMission = activityMissionMap.get(activityId);
if (activityMission != null) {
ActivityTypeEnum.getActicityType(sGlobalActivity.getId()).onActivityEndSelfWithDealReward(user);
AbstractActivity abstractActivity = ActivityTypeEnum.getActicityType(sGlobalActivity.getId());
if (null==abstractActivity) {
continue;
}
abstractActivity.onActivityEndSelfWithDealReward(user);
activityManager.removeActivity(activityId);
LOGGER.info("the uid={},remove the activity id ={}", user.getId(), activityId);
if (builder != null) {
@ -367,7 +381,7 @@ public class ActivityLogic {
}
AbstractActivity abstractActivity = ActivityTypeEnum.getActicityType(activityId);
if (abstractActivity == null) {
if (null==abstractActivity) {
continue;
}