hy/aslan-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cp 逻辑去除

Browse Source
This commit is contained in:
tianfeng 2026-01-14 11:14:22 +08:00
parent e2d3955793
commit 17f1b83a6e
4 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/activity/RankingActivityRestController.java
View File

@ -53,9 +53,6 @@ public class RankingActivityRestController extends BaseController {
*/ */
@PostMapping("/list") @PostMapping("/list")
public RankingListCO getRankingList(@RequestBody @Validated RankingListQueryCmd cmd) { public RankingListCO getRankingList(@RequestBody @Validated RankingListQueryCmd cmd) {
if (cmd.getCycleType() == null) {
cmd.setCycleKey(ZonedDateTimeAsiaRiyadhUtils.nowWeekMondayToInt().toString());
}
return rankingActivityService.getRankingList(cmd); return rankingActivityService.getRankingList(cmd);
} }

3
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/query/RankingListQryExe.java
View File

@ -50,9 +50,6 @@ public class RankingListQryExe {
public RankingListCO execute(RankingListQueryCmd cmd) { public RankingListCO execute(RankingListQueryCmd cmd) {
// 获取枚举 // 获取枚举
RankingActivityType activityType = RankingActivityType.getByCode(cmd.getActivityType()); 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; RankingCycleType cycleType = cmd.getCycleType() != null ? RankingCycleType.getByCode(cmd.getCycleType()) : RankingCycleType.WEEKLY;

9
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/strategy/RankCountStrategy.java
View File

@ -389,11 +389,6 @@ public class RankCountStrategy implements GiftStrategy {
RankingActivityType activityType = RankingActivityType.valueOf(activity.getActivityType()); RankingActivityType activityType = RankingActivityType.valueOf(activity.getActivityType());
Integer cycleType = RankingCycleType.WEEKLY.getCode(); Integer cycleType = RankingCycleType.WEEKLY.getCode();
if (RankingActivityType.CP_SEASON == activityType) {
cycleType = RankingCycleType.SEASON.getCode();
cycleKey = SeasonUtils.getCurrentSeasonCycleKey();
}
getDataUpdateCmd(runningWater, cycleKey, actualAmount, activityType, cycleType); getDataUpdateCmd(runningWater, cycleKey, actualAmount, activityType, cycleType);
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
log.warn("未识别的活动类型: {}, activityId={}", activity.getActivityType(), activity.getId()); log.warn("未识别的活动类型: {}, activityId={}", activity.getActivityType(), activity.getId());
@ -417,10 +412,6 @@ public class RankCountStrategy implements GiftStrategy {
return false; 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())); return activity.getGiftIds().contains(String.valueOf(runningWater.getGiftId()));
} }

4
rc-service/rc-service-other/other-domain/src/main/java/com/red/circle/other/domain/ranking/RankingActivityType.java
View File

@ -50,10 +50,6 @@ public enum RankingActivityType {
FRUIT_PARTY(11, "FruitParty", "统计游戏数据排行"), FRUIT_PARTY(11, "FruitParty", "统计游戏数据排行"),
CHRISTMAS(12, "圣诞节活动", "统计送礼物消费排行"), CHRISTMAS(12, "圣诞节活动", "统计送礼物消费排行"),
CP_WEEKLY(13, "CP周榜", "统计送CP礼物消费排行"),
CP_SEASON(14, "CP季度榜", "统计送CP礼物消费排行"),
; ;
/** /**