cp 逻辑去除
This commit is contained in:
parent
e2d3955793
commit
17f1b83a6e
@ -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);
|
||||
}
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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()));
|
||||
}
|
||||
|
||||
@ -50,10 +50,6 @@ public enum RankingActivityType {
|
||||
FRUIT_PARTY(11, "FruitParty", "统计游戏数据排行"),
|
||||
|
||||
CHRISTMAS(12, "圣诞节活动", "统计送礼物消费排行"),
|
||||
|
||||
CP_WEEKLY(13, "CP周榜", "统计送CP礼物消费排行"),
|
||||
|
||||
CP_SEASON(14, "CP季度榜", "统计送CP礼物消费排行"),
|
||||
;
|
||||
|
||||
/**
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user