diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java index b9fdb74cc..9496f8cc9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java @@ -173,6 +173,8 @@ public abstract class AbstractActivity implements IActivity, IEventHandler { itemArrs.add(reward); } + if(itemArrs.size()==0) + return; SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id); if (null == sGlobalActivity) return; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index e81dcfd29..b87fe522e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -160,8 +160,8 @@ public class ActivityLogic { if (endTime != 0 && now > endTime) { ActivityMission activityMission = activityMissionMap.get(activityId); if (activityMission != null) { - activityManager.removeActivity(activityId); ActivityTypeEnum.getActicityType(sGlobalActivity.getId()).onActivityEndSelfWithDealReward(user); + activityManager.removeActivity(activityId); LOGGER.info("the uid={},remove the activity id ={}", user.getId(), activityId); if (builder != null) { builder.addCloseActivityId(activityId); @@ -180,8 +180,8 @@ public class ActivityLogic { } else { ActivityMission activityMission = activityMissionMap.get(activityId); if (activityMission != null) { - activityManager.removeActivity(activityId); ActivityTypeEnum.getActicityType(sGlobalActivity.getId()).onActivityEndSelfWithDealReward(user); + activityManager.removeActivity(activityId); LOGGER.info("the uid={},remove the activity id ={}", user.getId(), activityId); if (builder != null) { builder.addCloseActivityId(activityId);