root
/
miduo_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2021-12-22 09:00:00 之后开的服，首充不显示累充满100元任务

back_recharge
jiahuiwen 2021-12-20 11:51:13 +08:00
parent 7ea5e79269
commit 2596eb08b9
2 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java
View File

@ -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<CommonProto.ActivityInfo.MissionInfo> getAllMissInfo(User user,ActivityMission activityMission, Set<Integer> filter) {
Map<Integer, ActivityProgressInfo> activityProgressInfoMap = activityMission.getActivityMissionMap();
List<CommonProto.ActivityInfo.MissionInfo> missionInfos = new ArrayList<>(activityProgressInfoMap.size());
long now = TimeUtils.now();
for (Map.Entry<Integer, ActivityProgressInfo> 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());
}

36
serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeTotalActivity.java
View File

@ -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<CommonProto.ActivityInfo.MissionInfo> getAllMissInfo(User user, ActivityMission activityMission, Set<Integer> filter) {
Map<Integer, ActivityProgressInfo> activityProgressInfoMap = activityMission.getActivityMissionMap();
List<CommonProto.ActivityInfo.MissionInfo> missionInfos = new ArrayList<>(activityProgressInfoMap.size());
long now = TimeUtils.now();
for (Map.Entry<Integer, ActivityProgressInfo> 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;
}
}