diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/game/GameActivityService.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/game/GameActivityService.java index 831692c7..4c353944 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/game/GameActivityService.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/game/GameActivityService.java @@ -113,7 +113,6 @@ public class GameActivityService { if (ZonedDateTimeAsiaRiyadhUtils.now().isAfter(finish)) { return; } - String regionId = userRegionGateway.getRegionId(userId); RankingDataUpdateCmd cmd = new RankingDataUpdateCmd(); cmd.setUserId(userId); cmd.setUserSex(1); @@ -123,7 +122,6 @@ public class GameActivityService { cmd.setDimension(RankingDimension.GAME_WIN.getCode()); cmd.setIncrementQuantity(rewardAmount); cmd.setBizNo(gameId); - cmd.setRegionId(regionId); cmd.setReqSysOrigin(ReqSysOrigin.of("LIKEI")); rankingActivityService.accumulateRankingData(cmd); } catch (Exception e) { diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/game/GameBaishunServiceImpl.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/game/GameBaishunServiceImpl.java index 05f9e8a3..694bd51f 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/game/GameBaishunServiceImpl.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/game/GameBaishunServiceImpl.java @@ -63,7 +63,6 @@ public class GameBaishunServiceImpl implements GameBaishunService { private final GameBaishunProperties gameBaishunProperties; private final TaskMqMessage taskMqMessage; private final UserProfileAppConvertor userProfileAppConvertor; - private final EnumConfigCacheService enumConfigCacheService; private final GameListConfigService gameListConfigService; private final GameListCacheService gameListCacheService; private final TaskService taskService; diff --git a/rc-service/rc-service-other/other-domain/src/main/java/com/red/circle/other/domain/ranking/RankingActivityType.java b/rc-service/rc-service-other/other-domain/src/main/java/com/red/circle/other/domain/ranking/RankingActivityType.java index 2e0172e0..cbb5db5f 100644 --- a/rc-service/rc-service-other/other-domain/src/main/java/com/red/circle/other/domain/ranking/RankingActivityType.java +++ b/rc-service/rc-service-other/other-domain/src/main/java/com/red/circle/other/domain/ranking/RankingActivityType.java @@ -79,6 +79,13 @@ public enum RankingActivityType { */ private static final Set SEASON_TYPES = Set.of(OPEN_RAMADAN); + private static final Set EID_AL_ADHA_TYPES = Set.of(EID_AL_ADHA); + + private static final Set DAILY_TYPES = Set.of(KING_GAMES_DAILY, MAGIC_GIFT_DAILY); + + /** 不按地区分区的活动类型(全局榜,regionId 为 null) */ + private static final Set NO_PARTITION_TYPES = Set.of(EID_AL_ADHA, FOOT_BALL); + /** * 类型编码 */ @@ -136,4 +143,17 @@ public enum RankingActivityType { public boolean isSeasonCycle() { return SEASON_TYPES.contains(this); } + + public boolean isEidAlAdhaCycle() { + return EID_AL_ADHA_TYPES.contains(this); + } + + public boolean isDailyCycle() { + return DAILY_TYPES.contains(this); + } + + /** 是否不分区(全局榜,不传 regionId) */ + public boolean isNoPartition() { + return NO_PARTITION_TYPES.contains(this); + } } \ No newline at end of file