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 dcce7b23b..a02d4f8f4 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 @@ -23,8 +23,6 @@ import com.ljsd.jieling.util.MessageUtil; import config.SActivityRewardConfig; import config.SErrorCodeEerverConfig; import config.SGlobalActivity; -import config.SSpiritAnimalSummon; -import manager.STableManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import rpc.protocols.CommonProto; @@ -378,26 +376,11 @@ public abstract class AbstractActivity implements IActivity, IEventHandler { public List getAllMissInfo(User user,ActivityMission activityMission, Set filter) { Map activityProgressInfoMap = activityMission.getActivityMissionMap(); List missionInfos = new ArrayList<>(activityProgressInfoMap.size()); - long now = TimeUtils.now(); for (Map.Entry missionProgress : activityProgressInfoMap.entrySet()) { if (filter != null && !filter.contains(missionProgress.getKey())) { continue; } Integer missionId = missionProgress.getKey(); - SActivityRewardConfig sActivityRewardConfig = SActivityRewardConfig.getsActivityRewardConfigByMissionId(missionId); - if (missionId != 0 && sActivityRewardConfig == null) { - // missionId==0 灵兽宝阁特殊使用 - continue; - } - if(id == ActivityType.RechargeTotal){ - // 2021-12-22 09:00:00 之后开的服,首充不显示累充满100元任务 - if (now > 1640134800000L) { - int value = sActivityRewardConfig.getValues()[0][0]; - if (value == 100) { - continue; - } - } - } ActivityProgressInfo activityProgressInfo = missionProgress.getValue(); missionInfos.add(CommonProto.ActivityInfo.MissionInfo.newBuilder().setMissionId(missionId).setProgress(activityProgressInfo.getProgrss()).setState(activityProgressInfo.getState()).build()); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeTotalActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeTotalActivity.java index 0046b72fc..ae28461c7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeTotalActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeTotalActivity.java @@ -1,13 +1,20 @@ package com.ljsd.jieling.logic.activity; +import com.ljsd.jieling.jbean.ActivityMission; import com.ljsd.jieling.jbean.ActivityProgressInfo; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.store.newRechargeInfo.NewRechargeInfo; import com.ljsd.jieling.network.session.ISession; import config.SActivityRewardConfig; +import rpc.protocols.CommonProto; import util.TimeUtils; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + class RechargeTotalActivity extends AbstractActivity { public RechargeTotalActivity(int id) { @@ -27,4 +34,33 @@ class RechargeTotalActivity extends AbstractActivity { } return true; } + + @Override + public List getAllMissInfo(User user, ActivityMission activityMission, Set filter) { + Map activityProgressInfoMap = activityMission.getActivityMissionMap(); + List missionInfos = new ArrayList<>(activityProgressInfoMap.size()); + long now = TimeUtils.now(); + for (Map.Entry missionProgress : activityProgressInfoMap.entrySet()) { + if (filter != null && !filter.contains(missionProgress.getKey())) { + continue; + } + Integer missionId = missionProgress.getKey(); + SActivityRewardConfig sActivityRewardConfig = SActivityRewardConfig.getsActivityRewardConfigByMissionId(missionId); + if (sActivityRewardConfig == null) { + continue; + } + if(id == ActivityType.RechargeTotal){ + // 2021-12-22 09:00:00 之后开的服,首充不显示累充满100元任务 + if (now > 1640134800000L) { + int value = sActivityRewardConfig.getValues()[0][0]; + if (value == 100) { + continue; + } + } + } + ActivityProgressInfo activityProgressInfo = missionProgress.getValue(); + missionInfos.add(CommonProto.ActivityInfo.MissionInfo.newBuilder().setMissionId(missionId).setProgress(activityProgressInfo.getProgrss()).setState(activityProgressInfo.getState()).build()); + } + return missionInfos; + } }