diff --git a/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/activity/RankingActivityRestController.java b/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/activity/RankingActivityRestController.java index 474a393f..63c6a9d8 100644 --- a/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/activity/RankingActivityRestController.java +++ b/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/activity/RankingActivityRestController.java @@ -53,9 +53,6 @@ public class RankingActivityRestController extends BaseController { */ @PostMapping("/list") public RankingListCO getRankingList(@RequestBody @Validated RankingListQueryCmd cmd) { - if (cmd.getCycleType() == null) { - cmd.setCycleKey(ZonedDateTimeAsiaRiyadhUtils.nowWeekMondayToInt().toString()); - } return rankingActivityService.getRankingList(cmd); } diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/query/RankingListQryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/query/RankingListQryExe.java index 8a1c3c29..c572f88d 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/query/RankingListQryExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/query/RankingListQryExe.java @@ -50,9 +50,6 @@ public class RankingListQryExe { public RankingListCO execute(RankingListQueryCmd cmd) { // 获取枚举 RankingActivityType activityType = RankingActivityType.getByCode(cmd.getActivityType()); - if (activityType == RankingActivityType.CHRISTMAS || activityType == RankingActivityType.FRUIT_PARTY) { - cmd.setCycleKey("20251222"); - } RankingCycleType cycleType = cmd.getCycleType() != null ? RankingCycleType.getByCode(cmd.getCycleType()) : RankingCycleType.WEEKLY; diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/strategy/RankCountStrategy.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/strategy/RankCountStrategy.java index 67adb918..94b955d6 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/strategy/RankCountStrategy.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/strategy/RankCountStrategy.java @@ -389,11 +389,6 @@ public class RankCountStrategy implements GiftStrategy { RankingActivityType activityType = RankingActivityType.valueOf(activity.getActivityType()); Integer cycleType = RankingCycleType.WEEKLY.getCode(); - if (RankingActivityType.CP_SEASON == activityType) { - cycleType = RankingCycleType.SEASON.getCode(); - cycleKey = SeasonUtils.getCurrentSeasonCycleKey(); - } - getDataUpdateCmd(runningWater, cycleKey, actualAmount, activityType, cycleType); } catch (IllegalArgumentException e) { log.warn("未识别的活动类型: {}, activityId={}", activity.getActivityType(), activity.getId()); @@ -417,10 +412,6 @@ public class RankCountStrategy implements GiftStrategy { return false; } - if (Arrays.asList(RankingActivityType.CP_SEASON, RankingActivityType.CP_WEEKLY).contains(activityType)) { - return isCpGift(runningWater.getGiftValue()); - } - // 默认规则 return activity.getGiftIds().contains(String.valueOf(runningWater.getGiftId())); } 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 53f9e97d..4a5d4fdf 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 @@ -50,10 +50,6 @@ public enum RankingActivityType { FRUIT_PARTY(11, "FruitParty", "统计游戏数据排行"), CHRISTMAS(12, "圣诞节活动", "统计送礼物消费排行"), - - CP_WEEKLY(13, "CP周榜", "统计送CP礼物消费排行"), - - CP_SEASON(14, "CP季度榜", "统计送CP礼物消费排行"), ; /**