diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/WeekCardActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/WeekCardActivity.java index 850c6f5c9..b5bfbba1f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/WeekCardActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/WeekCardActivity.java @@ -12,6 +12,7 @@ import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.mail.MailLogic; import com.ljsd.jieling.util.ItemUtil; +import com.ljsd.jieling.util.ToolsUtil; import config.*; import manager.STableManager; import util.TimeUtils; @@ -68,19 +69,16 @@ public class WeekCardActivity extends AbstractActivity { /** * 封装周卡信息 - * @param cardId - * @param activityId - * @param valueMap - * @return */ private Map packagingWeekCardMap(User user, int activityId, int cardId, Map valueMap){ HashMap result = new HashMap<>(); Map config = STableManager.getConfig(SWeekcardConfig.class); - SWeekcardConfig sWeekcardConfig = config.get(cardId); + SGlobalActivity activity = SGlobalActivity.getsGlobalActivityMap().get(activityId); + long createTime = user.getPlayerInfoManager().getCreateTime(); // 计算间隔时间 - long startTimeLong = WeekCardLogic.getInstance().getStartTime(user, activityId); + long startTimeLong = ToolsUtil.getTimeLong(activity.getStartTimeLong(),activity.getEndTimeLong(),activity.getTime(),createTime,1); int days = TimeUtils.differentDays(startTimeLong, TimeUtils.now()) + 1; for (int[] ints : sWeekcardConfig.getBaseRewardID()) { @@ -111,8 +109,11 @@ public class WeekCardActivity extends AbstractActivity { Map> weekCard = user.getPlayerInfoManager().getWeekCard(); Map rewardConfigMap = STableManager.getConfig(SWeekRewardConfig.class); Map configMap = STableManager.getConfig(SWeekcardConfig.class); + + SGlobalActivity activity = SGlobalActivity.getsGlobalActivityMap().get(id); + long createTime = user.getPlayerInfoManager().getCreateTime(); // 计算间隔时间 - long startTimeLong = WeekCardLogic.getInstance().getStartTime(user,id); + long startTimeLong = ToolsUtil.getTimeLong(activity.getStartTimeLong(),activity.getEndTimeLong(),activity.getTime(),createTime,1); int days = TimeUtils.differentDays(startTimeLong, TimeUtils.now())+1; for (Map.Entry> entry : weekCard.entrySet()) { @@ -151,7 +152,7 @@ public class WeekCardActivity extends AbstractActivity { } weekCard.put(weekCardId,value); } - if (itemArrs.size() == 0) { + if (itemArrs.isEmpty()) { return; } // 更新数据 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java index 673d45d27..342756ec2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java @@ -271,7 +271,7 @@ public class UserMissionManager extends MongoBase { if(!achievementMissionTypMap.getDoingMissionIds().isEmpty() ){ List sAchievementConfigs = SAchievementConfig.sTaskConfigByTypeMap.get(missionType.getMissionTypeValue()); - if(sAchievementConfigs!=null&&sAchievementConfigs.size()!=0){ + if(sAchievementConfigs!=null&& !sAchievementConfigs.isEmpty()){ CumulationData.Result result= achievementMap.updateData(missionType, parm); if(result!=null){ achievementMissionTypMap.calCumulationDataResult(user,result,missionTypeEnumListMap.get(GameMisionType.ACHIEVEMISSION),achievementMap); @@ -293,7 +293,7 @@ public class UserMissionManager extends MongoBase { //缥缈之旅 if(!mistyTripMissionType.getDoingMissionIds().isEmpty() ){ Map config = STableManager.getConfig(SJourneyWithWind.class); - if(config!=null&&config.size()!=0){ + if(config!=null&& !config.isEmpty()){ int starSum = HardStageLogic.getHardStageStarsSum(user); if(starSum != 0 && mistyTripCumulationData.getHardstage_stars() == 0){ mistyTripCumulationData.setHardstage_stars(starSum);