Merge branch 'master' of 60.1.1.230:backend/jieling_server

wangyuan 2019-08-19 00:01:07 +08:00
commit 20a228b9b9
2 changed files with 4 additions and 2 deletions

View File

@ -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;

View File

@ -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);