From 9dd949808df0188e15a0eac7c3bc3296e7354938 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Mon, 13 Jan 2020 17:43:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/GlobalDataManaager.java | 2 +- .../java/com/ljsd/jieling/logic/activity/ActivityLogic.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java index f71bd5dcb..b85a95edc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java @@ -354,7 +354,7 @@ public class GlobalDataManaager implements IManager { public static void flushGoodsTimes(User user){ Map buyGoodsTimes = user.getPlayerInfoManager().getRechargeInfo().getBuyGoodsTimes(); - if(buyGoodsTimes!=null && buyGoodsTimes.isEmpty()){ + if(buyGoodsTimes!=null && !buyGoodsTimes.isEmpty()){ Iterator iterator = buyGoodsTimes.keySet().iterator(); boolean update = false; while (iterator.hasNext()){ 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 3ca6d6599..a53df488d 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 @@ -297,7 +297,7 @@ public class ActivityLogic implements IEventHandler{ checkNeedOpenStore(user,sGlobalActivity.getShopId(),startTime,endTime); } else { long endTime = sGlobalActivity.getEndTimeLong(); - goRewardActivity(user,activityId,builder,now>endTime + sGlobalActivity.getGapTime()); + goRewardActivity(user,activityId,builder,now>endTime + sGlobalActivity.getGapTime()*TimeUtils.ONE_DAY); } } return openNewActivityIds; @@ -355,7 +355,7 @@ public class ActivityLogic implements IEventHandler{ MessageUtil.sendIndicationMessage(session, 1, MessageTypeProto.MessageType.LUCKWHEEL_POOL_INDICATION_VALUE, builder.build(), true); } - private List getActivityInfos(Map activityMissionMap, long createTime) { + private List getActivityInfos(Map activityMissionMap, long createTime) { Map sGlobalActivityMap = SGlobalActivity.getsGlobalActivityMap(); List activityInfoList = new ArrayList<>(activityMissionMap.size()); for (Map.Entry activityState : activityMissionMap.entrySet()) { @@ -374,6 +374,7 @@ public class ActivityLogic implements IEventHandler{ if(activityStatus == ActivityType.CLOSE_STATE){ long prepareTime = ToolsUtil.getEndTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),0, sGlobalActivity.getGapTime()); activityInfoList.add(CommonProto.ActivityInfo.newBuilder().setActivityId(activityId).setEndTime((int)(prepareTime/1000)).build()); + continue; } if (sGlobalActivity.getIsSaving()==0 && activityStatus != ActivityType.OPEN_STATE) {