diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/manager/activity/award/WeeklyRewardsSentManager.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/manager/activity/award/WeeklyRewardsSentManager.java index cd3f9b68..65286459 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/manager/activity/award/WeeklyRewardsSentManager.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/manager/activity/award/WeeklyRewardsSentManager.java @@ -121,12 +121,6 @@ public class WeeklyRewardsSentManager { // 上周国王王后奖励 sendLastWeekKingQueen(sysOriginPlatformEnum); - // CP - processSendRewardCp(sysOriginPlatformEnum, null); - - // 代理活动 - 周 - processSendRewardAgentActivity(sysOriginPlatformEnum, "WEEK", null); - }); log.warn("[execute] 每周奖励统一发送 end:{}", LocalDateTimeUtils.nowFormat("yyyy-MM-dd")); diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/DiamondToCoinsTask.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/DiamondToCoinsTask.java index e17556e6..02668f99 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/DiamondToCoinsTask.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/DiamondToCoinsTask.java @@ -27,7 +27,7 @@ import java.util.Map; * @author pengshigang on 2022/8/19 */ @Slf4j -@Component +//@Component @AllArgsConstructor public class DiamondToCoinsTask { diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/FamilyLeaderboardInitTask.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/FamilyLeaderboardInitTask.java index c4817d78..9458d49e 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/FamilyLeaderboardInitTask.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/FamilyLeaderboardInitTask.java @@ -19,7 +19,7 @@ import org.springframework.stereotype.Component; * @author pengshigang on 2021/7/24 */ @Slf4j -@Component +//@Component @AllArgsConstructor public class FamilyLeaderboardInitTask { diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/GameKtvTask.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/GameKtvTask.java index 5bae4085..4ae9a3f9 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/GameKtvTask.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/GameKtvTask.java @@ -27,7 +27,7 @@ import org.springframework.stereotype.Component; * @author pengshigang on 2023/5/8. */ @Slf4j -@Component +//@Component @AllArgsConstructor public class GameKtvTask { diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/GameRoomPkTask.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/GameRoomPkTask.java index 67ab36ef..09aa6546 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/GameRoomPkTask.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/GameRoomPkTask.java @@ -34,7 +34,7 @@ import org.springframework.stereotype.Component; * @author pengshigang on 2021/9/27 */ @Slf4j -@Component +//@Component @AllArgsConstructor public class GameRoomPkTask { diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/MonthFixedActivityTask.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/MonthFixedActivityTask.java index 41a95b75..58f58624 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/MonthFixedActivityTask.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/MonthFixedActivityTask.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Component; * @author pengshigang on 2021/10/27 */ @Slf4j -@Component +//@Component @AllArgsConstructor public class MonthFixedActivityTask { diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/ResetWeekStarGiftTask.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/ResetWeekStarGiftTask.java index 702caa61..f9dfb6e4 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/ResetWeekStarGiftTask.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/ResetWeekStarGiftTask.java @@ -32,8 +32,6 @@ import org.springframework.stereotype.Component; @AllArgsConstructor public class ResetWeekStarGiftTask { -// private final EmailService emailService; -// private final ControlProperties controlProperties; private final GiftConfigService giftConfigService; private final WeekStarGiftService weekStarGiftService; private final WeekStarCacheService weekStarCacheService; @@ -49,9 +47,6 @@ public class ResetWeekStarGiftTask { long startTime = System.currentTimeMillis(); log.warn("exec reset_week_star_gift start"); printExecuteLog(); - -// sendEmail(); - processWeekStar(); log.warn("exec reset_week_star_gift end with {}",System.currentTimeMillis()-startTime); } @@ -75,25 +70,6 @@ public class ResetWeekStarGiftTask { DateFormatEnum.yyyy_MM_dd_HH_mm_ss)); } -// private void sendEmail() { -// try { -// String nowAsiaRiyadh = ZonedDateTimeUtils -// .nowAsiaRiyadh(DateFormatEnum.yyyy_MM_dd_HH_mm_ss); -// String thisWeekMondayAsiaRiyadh = ZonedDateTimeUtils -// .format(ZonedDateTimeUtils.nowAsiaRiyadhWeekMonday(), -// DateFormatEnum.yyyy_MM_dd_HH_mm_ss); -// String nowUtc = LocalDateTimeUtils -// .nowFormat(DateFormatEnum.yyyy_MM_dd_HH_mm_ss.getPattern()); -// emailService.sendSimpleMailMessage(controlProperties.getAlarmMailToString(), -// "执行周期周星", -// "执行时间AsiaRiyadh:" + nowAsiaRiyadh -// + ",UTC:" + nowUtc -// + ",本周一AsiaRiyadh:" + thisWeekMondayAsiaRiyadh -// + ",本周一UTC:" + LocalDateUtils.nowWeekMonday()); -// } catch (Exception ex) { -// log.error("sendEmail fail:{}", ex.getMessage()); -// } -// } private String getStartDate() { return LocalDateTimeUtils.nowFormat("dd/MM/yyyy"); diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/WeeklyFixedActivityTask.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/WeeklyFixedActivityTask.java index 78102297..4e42b4b2 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/WeeklyFixedActivityTask.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/WeeklyFixedActivityTask.java @@ -52,10 +52,6 @@ public class WeeklyFixedActivityTask { @Scheduled(cron = "5 0 0 ? * MON", zone = "Asia/Riyadh") @TaskCacheLock(key = "WEEKLY_FIXED_ACTIVITY_TASK", expireSecond = 86400) public void startWeekActivityTask() { - - //调用其他每周活动,因为有些活动需要过滤周星礼物 - refreshWeekActivityManager.refreshWeeklyActivitiesWeekly(); - //发送全部活动奖励 - 周 refreshWeekActivityManager.weeklyAllRewardsSent();