From 70029bb5119da0d31537ca4b407d9f97eac5e492 Mon Sep 17 00:00:00 2001 From: hy001 Date: Wed, 13 May 2026 14:06:24 +0800 Subject: [PATCH] fix(console): pass country filter to game metric refresh --- .../app/datav/CountryDashboardGameMetricServiceImpl.java | 4 ++-- .../infra/database/rds/dao/datav/CountryDashboardDAO.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/datav/CountryDashboardGameMetricServiceImpl.java b/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/datav/CountryDashboardGameMetricServiceImpl.java index f34cc637..9bd669e9 100644 --- a/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/datav/CountryDashboardGameMetricServiceImpl.java +++ b/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/datav/CountryDashboardGameMetricServiceImpl.java @@ -218,10 +218,10 @@ public class CountryDashboardGameMetricServiceImpl implements CountryDashboardGa Map rows = new LinkedHashMap<>(); mergeAmounts(rows, countryDashboardDAO.listWalletGameMetricAmounts( window.periodType(), timeWindow.startTime(), timeWindow.endTime(), - timeWindow.startTimeMillis(), timeWindow.endTimeMillis(), sysOrigin, + timeWindow.startTimeMillis(), timeWindow.endTimeMillis(), null, sysOrigin, zoneOffset(STORAGE_ZONE_ID), statTimezone.offset()), window, sysOrigin, statTimezone); mergeAmounts(rows, countryDashboardDAO.listLuckyBoxGameMetricAmounts( - window.periodType(), timeWindow.startTime(), timeWindow.endTime(), sysOrigin, + window.periodType(), timeWindow.startTime(), timeWindow.endTime(), null, sysOrigin, zoneOffset(STORAGE_ZONE_ID), statTimezone.offset()), window, sysOrigin, statTimezone); RefreshWriteResult writeResult = transactionTemplate.execute(status -> { diff --git a/rc-service/rc-service-console/console-infrastructure/src/main/java/com/red/circle/console/infra/database/rds/dao/datav/CountryDashboardDAO.java b/rc-service/rc-service-console/console-infrastructure/src/main/java/com/red/circle/console/infra/database/rds/dao/datav/CountryDashboardDAO.java index 21c69675..1bfeb414 100644 --- a/rc-service/rc-service-console/console-infrastructure/src/main/java/com/red/circle/console/infra/database/rds/dao/datav/CountryDashboardDAO.java +++ b/rc-service/rc-service-console/console-infrastructure/src/main/java/com/red/circle/console/infra/database/rds/dao/datav/CountryDashboardDAO.java @@ -271,6 +271,7 @@ public interface CountryDashboardDAO extends BaseDAO { @Param("endTime") LocalDateTime endTime, @Param("startTimeMillis") Long startTimeMillis, @Param("endTimeMillis") Long endTimeMillis, + @Param("countryKeyword") String countryKeyword, @Param("sysOrigin") String sysOrigin, @Param("storageTimezoneOffset") String storageTimezoneOffset, @Param("statTimezoneOffset") String statTimezoneOffset); @@ -279,6 +280,7 @@ public interface CountryDashboardDAO extends BaseDAO { @Param("periodType") String periodType, @Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime, + @Param("countryKeyword") String countryKeyword, @Param("sysOrigin") String sysOrigin, @Param("storageTimezoneOffset") String storageTimezoneOffset, @Param("statTimezoneOffset") String statTimezoneOffset);