From fd7b37fc4ad2a1cdce177894f5daf91b996f44c3 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Fri, 13 Sep 2019 10:35:54 +0800 Subject: [PATCH] acitvity --- .../com/ljsd/jieling/logic/activity/AbstractActivity.java | 2 ++ .../java/com/ljsd/jieling/logic/activity/ActivityLogic.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) 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 c03537525..bd7966d05 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 @@ -157,8 +157,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); @@ -177,8 +177,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);