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 f6c8fcccc..dc1aecb2e 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 @@ -223,17 +223,17 @@ public class GmActivityLogic implements IEventHandler { gmActivity.putMissionMap(arbMission.getId(), gmMission); } - // 领取完 全部奖励后重置活动 - long count = gmActivity.getMissionMap().values().stream().filter(v -> v.getState() == 1).count(); -// LOGGER.info("单日累充,第二步,userid:{}, 活动id:{}, 完成度对比:{}-{}", user.getId(),gmActivity.getId(),gmMissionList.size(),count); - if (count > 0 && gmMissionList.size() == count){ - // 重置活动对象 - gmActivity.setMissionMap(new HashMap<>()); - // 减去满级金额 - num-=gmMissionList.get(gmMissionList.size()-1).getRechargeNum(); - verify = true; - LOGGER.info("单日累充,自动重置,userid:{}, 活动id:{}, 剩余金额:{}", user.getId(),gmActivity.getId(),num); - } + // 领取完 全部奖励后重置活动(最新版本不重置) +// long count = gmActivity.getMissionMap().values().stream().filter(v -> v.getState() == 1).count(); +//// LOGGER.info("单日累充,第二步,userid:{}, 活动id:{}, 完成度对比:{}-{}", user.getId(),gmActivity.getId(),gmMissionList.size(),count); +// if (count > 0 && gmMissionList.size() == count){ +// // 重置活动对象 +// gmActivity.setMissionMap(new HashMap<>()); +// // 减去满级金额 +// num-=gmMissionList.get(gmMissionList.size()-1).getRechargeNum(); +// verify = true; +// LOGGER.info("单日累充,自动重置,userid:{}, 活动id:{}, 剩余金额:{}", user.getId(),gmActivity.getId(),num); +// } } while (verify); gmActivity.setValue(num);