From 613a561e7685946278415c4f2a701a5b1e5373a1 Mon Sep 17 00:00:00 2001
From: hy001 <hy@hy001deMacBook-Pro.local>
Date: Fri, 24 Apr 2026 14:24:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/datav/CountryDashboardDAO.xml         | 46 +++++++++++++++++--
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/rc-service/rc-service-console/console-infrastructure/src/main/resources/dao/datav/CountryDashboardDAO.xml b/rc-service/rc-service-console/console-infrastructure/src/main/resources/dao/datav/CountryDashboardDAO.xml
index df7aa31a..467fbe3a 100644
--- a/rc-service/rc-service-console/console-infrastructure/src/main/resources/dao/datav/CountryDashboardDAO.xml
+++ b/rc-service/rc-service-console/console-infrastructure/src/main/resources/dao/datav/CountryDashboardDAO.xml
@@ -79,6 +79,44 @@
     </if>
   </sql>
 
+  <sql id="WalletGoldAssetRecordSource">
+    SELECT user_id, sys_origin, type, penny_amount, event_type, FROM_UNIXTIME(create_time / 1000) AS create_time
+    FROM likei_wallet.wallet_gold_asset_record_1
+    UNION ALL
+    SELECT user_id, sys_origin, type, penny_amount, event_type, FROM_UNIXTIME(create_time / 1000) AS create_time
+    FROM likei_wallet.wallet_gold_asset_record_2
+    UNION ALL
+    SELECT user_id, sys_origin, type, penny_amount, event_type, FROM_UNIXTIME(create_time / 1000) AS create_time
+    FROM likei_wallet.wallet_gold_asset_record_3
+    UNION ALL
+    SELECT user_id, sys_origin, type, penny_amount, event_type, FROM_UNIXTIME(create_time / 1000) AS create_time
+    FROM likei_wallet.wallet_gold_asset_record_4
+    UNION ALL
+    SELECT user_id, sys_origin, type, penny_amount, event_type, FROM_UNIXTIME(create_time / 1000) AS create_time
+    FROM likei_wallet.wallet_gold_asset_record_5
+    UNION ALL
+    SELECT user_id, sys_origin, type, penny_amount, event_type, FROM_UNIXTIME(create_time / 1000) AS create_time
+    FROM likei_wallet.wallet_gold_asset_record_6
+    UNION ALL
+    SELECT user_id, sys_origin, type, penny_amount, event_type, FROM_UNIXTIME(create_time / 1000) AS create_time
+    FROM likei_wallet.wallet_gold_asset_record_7
+    UNION ALL
+    SELECT user_id, sys_origin, type, penny_amount, event_type, FROM_UNIXTIME(create_time / 1000) AS create_time
+    FROM likei_wallet.wallet_gold_asset_record_8
+    UNION ALL
+    SELECT user_id, sys_origin, type, penny_amount, event_type, FROM_UNIXTIME(create_time / 1000) AS create_time
+    FROM likei_wallet.wallet_gold_asset_record_9
+    UNION ALL
+    SELECT user_id, sys_origin, type, penny_amount, event_type, FROM_UNIXTIME(create_time / 1000) AS create_time
+    FROM likei_wallet.wallet_gold_asset_record_10
+    UNION ALL
+    SELECT user_id, sys_origin, type, penny_amount, event_type, FROM_UNIXTIME(create_time / 1000) AS create_time
+    FROM likei_wallet.wallet_gold_asset_record_11
+    UNION ALL
+    SELECT user_id, sys_origin, type, penny_amount, event_type, FROM_UNIXTIME(create_time / 1000) AS create_time
+    FROM likei_wallet.wallet_gold_asset_record_12
+  </sql>
+
   <select id="listNewUsers"
     resultType="com.red.circle.console.infra.database.rds.dto.datav.CountryDashboardMetricDTO">
     SELECT
@@ -155,11 +193,11 @@
       IFNULL(SUM(t.amount), 0) AS salaryExchange
     FROM (
       SELECT user_id, sys_origin, amount, create_time
-      FROM user_salary_account_running_water
+      FROM likei_wallet.user_salary_account_running_water
       WHERE type = 1 AND salary_event = 'SALARY_EXCHANGE'
       UNION ALL
       SELECT user_id, sys_origin, amount, create_time
-      FROM user_salary_diamond_running_water
+      FROM likei_wallet.user_salary_diamond_running_water
       WHERE type = 1 AND salary_event = 'SALARY_EXCHANGE_GOLD_COINS'
     ) t
     INNER JOIN user_base_info u ON u.id = t.user_id
@@ -193,7 +231,9 @@
       <include refid="PeriodColumnsT"/>,
       IFNULL(SUM(CASE WHEN t.type = 1 THEN t.penny_amount ELSE 0 END) / 100.00, 0) AS gameTotalFlow,
       IFNULL(SUM(CASE WHEN t.type = 0 THEN t.penny_amount ELSE 0 END) / 100.00, 0) AS gamePayout
-    FROM wallet_gold_asset_record t
+    FROM (
+      <include refid="WalletGoldAssetRecordSource"/>
+    ) t
     INNER JOIN user_base_info u ON u.id = t.user_id
     WHERE (
         t.event_type IN (