diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java index ba39a1184..27abdbe32 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java @@ -378,22 +378,29 @@ public class GmActivityLogic implements IEventHandler { } Map arbActivityMap = getArbActivity(); - for (GmActivity gmActivity : manager.getActivityMap().values()) { - ARBActivity arbActivity = arbActivityMap.get(gmActivity.getId()); - // 活动已经从gm上删除了,在这里删除数据库中的 - if (arbActivity == null){ - manager.removeActivity(gmActivity.getId()); - LOGGER.info("返利活动删除,uid:{},活动id:{}",user.getId(),gmActivity.getId()); - continue; - } - // 单日累充和妖晶返利每日清零 - if (gmActivity.getType() == 1 || gmActivity.getType() == 2 || gmActivity.getType() == 4){ - gmActivity.setValue(0); - gmActivity.setMissionMap(new HashMap<>()); - LOGGER.info("返利活动重置,uid:{},活动id:{}",user.getId(),gmActivity.getId()); + for (ARBActivity value : arbActivityMap.values()) { + if (value.getType() == 1 || value.getType() == 2 || value.getType() == 4){ + manager.removeActivity(value.getId()); + LOGGER.info("返利活动重置,uid:{},活动id:{}, type:{}",user.getId(),value.getId(), value.getType()); } } +// for (GmActivity gmActivity : manager.getActivityMap().values()) { +// ARBActivity arbActivity = arbActivityMap.get(gmActivity.getId()); +// // 活动已经从gm上删除了,在这里删除数据库中的 +// if (arbActivity == null){ +// manager.removeActivity(gmActivity.getId()); +// LOGGER.info("返利活动删除,uid:{},活动id:{}",user.getId(),gmActivity.getId()); +// continue; +// } +// // 单日累充和妖晶返利每日清零 +// if (gmActivity.getType() == 1 || gmActivity.getType() == 2 || gmActivity.getType() == 4){ +// gmActivity.setValue(0); +// gmActivity.setMissionMap(new HashMap<>()); +// LOGGER.info("返利活动重置,uid:{},活动id:{}",user.getId(),gmActivity.getId()); +// } +// } + manager.setUpdateTime(nowTime); LOGGER.info("返利活动重置结束,uid:{},刷新时间:{}",user.getId(),manager.getUpdateTime()); }