From 806dd0d33303e8d9e28087e35580c6abbec2c96d Mon Sep 17 00:00:00 2001 From: duhui Date: Thu, 9 Feb 2023 20:51:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/activityLogic/GmActivityLogic.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) 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 b1884c035..3975d8062 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 @@ -192,18 +192,19 @@ public class GmActivityLogic implements IEventHandler { int num = gmActivity.getValue() + (int) price; // do-while循环，重置奖励后再次验证 boolean verify; + LOGGER.info("单日累充，第一步，userid：{}, 活动id：{}， 金额：{}", user.getId(),gmActivity.getId(),num); do { verify = false; for (ARBMission arbMission : gmMissionList) { GmMission gmMission = gmActivity.getMissionMap().getOrDefault(arbMission.getId(), new GmMission()); // 已领取 if (gmMission.getState() == 1){ - LOGGER.error("单日累充，档位已领取，userid：{}, 活动id：{}， 档位id：{}", user.getId(),gmActivity.getId(),gmMission.getId()); + LOGGER.info("单日累充，档位已领取，userid：{}, 活动id：{}， 档位id：{}", user.getId(),gmActivity.getId(),gmMission.getId()); continue; } // 不能领 if (num < arbMission.getRechargeNum()){ - LOGGER.error("单日累充，金额不足，userid：{}, 活动id：{}， 金额：{}-{}", user.getId(),gmActivity.getId(),num,arbMission.getRechargeNum()); + LOGGER.info("单日累充，金额不足，userid：{}, 活动id：{}， 金额：{}-{}", user.getId(),gmActivity.getId(),num,arbMission.getRechargeNum()); continue; } // 发邮件 @@ -219,12 +220,14 @@ public class GmActivityLogic implements IEventHandler { // 领取完全部奖励后重置活动 long count = gmActivity.getMissionMap().values().stream().filter(v -> v.getState() == 1).count(); + LOGGER.info("单日累充，第二步，userid：{}, 活动id：{}， 完成度对比：{}-{}", user.getId(),gmActivity.getId(),gmMissionList.size(),count); if (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); @@ -242,12 +245,12 @@ public class GmActivityLogic implements IEventHandler { GmMission gmMission = gmActivity.getMissionMap().getOrDefault(arbMission.getId(), new GmMission()); // 已领取 if (gmMission.getState() == 1){ - LOGGER.error("单笔充值奖励，档位已领取，userid：{}, 活动id：{}， 档位id：{}", user.getId(),gmActivity.getId(),gmMission.getId()); + LOGGER.info("单笔充值奖励，档位已领取，userid：{}, 活动id：{}， 档位id：{}", user.getId(),gmActivity.getId(),gmMission.getId()); continue; } // 不能领 if (price != arbMission.getRechargeNum()){ - LOGGER.error("单笔充值奖励，金额对比失败，userid：{}, 活动id：{}， 金额：{}-{}", user.getId(),gmActivity.getId(),price,arbMission.getRechargeNum()); + LOGGER.info("单笔充值奖励，金额对比失败，userid：{}, 活动id：{}， 金额：{}-{}", user.getId(),gmActivity.getId(),price,arbMission.getRechargeNum()); continue; } // 发邮件 @@ -270,7 +273,7 @@ public class GmActivityLogic implements IEventHandler { private void getRewardToMonsterCurrencyBack(User user, GmActivity gmActivity, double price) throws Exception { Map missionMap = findAllGmMissionMap(gmActivity.getId()); if (missionMap == null || missionMap.isEmpty()) { - LOGGER.error("妖晶返利活动，详细档位信息未配置，userid：{}, 活动id：{}", user.getId(), gmActivity.getId()); + LOGGER.info("妖晶返利活动，详细档位信息未配置，userid：{}, 活动id：{}", user.getId(), gmActivity.getId()); return; } // 档位排序 @@ -284,7 +287,7 @@ public class GmActivityLogic implements IEventHandler { // 最低要求 int limit = arbMissions.get(0).getBeforeNum(); if (sumMoney < limit || sumMoney <= 0) { - LOGGER.error("妖晶返利活动，充值金额不足最低领取调解，userid：{},活动id：{},当前累充金额：{}，最低条件：{}", user.getId(), gmActivity.getId(), sumMoney, limit); + LOGGER.info("妖晶返利活动，充值金额不足最低领取调解，userid：{},活动id：{},当前累充金额：{}，最低条件：{}", user.getId(), gmActivity.getId(), sumMoney, limit); return; } // 首次计算标记