处理冲突

app/admin/repositories/ad_revenue.py

@@ -406,10 +406,6 @@ def ad_revenue_report(
         for k, v in scene_map.items()
     }
 
-    # DAU:复用大盘「今日活跃」口径(stats.today_dau,last_login_at)。该口径只能算今日,
-    # 故仅当查询=今日单天时给值;历史 / 多天区间返回 None,前端显示「-」。
-    is_today = date_from == date_to == rewards.cn_today().isoformat()
-    dau = admin_stats.today_dau(db) if is_today else None
     # DAU:复用数据大盘活跃用户口径(登录 + 开始比价 + 开始领券,按用户去重),按所选日期区间
     # 统计(含今日),历史 / 多天区间同样有值。ARPU = 区间预估收益 ÷ 区间活跃用户。全局口径,
     # 不随 user / ad_type / feed_scene / app_env 筛选变化(活跃用户口径无这些维度)。

app/admin/repositories/stats.py

@@ -320,29 +320,12 @@ def dashboard_overview(
             ComparisonRecord.created_at >= day_start_local,
             ComparisonRecord.created_at < day_end_local,
         )
-        daily_login_user_ids = _user_id_set(
-            select(User.id).where(
-                User.last_login_at >= day_start_utc,
-                User.last_login_at < day_end_utc,
-            )
-        )
-        daily_compare_start_user_ids = _event_user_ids(
-            db, (COMPARE_START_EVENT,), day_start_utc, day_end_utc
-        )
-        daily_coupon_event_user_ids = _event_user_ids(
-            db, (COUPON_START_EVENT,), day_start_utc, day_end_utc
-        )
-        daily_coupon_claim_user_ids = _user_id_set(
-            select(CouponPromptEngagement.user_id).where(
-                CouponPromptEngagement.engage_date == cur_date,
-                CouponPromptEngagement.engage_type == "claim_started",
-            )
-        )
-        daily_active_user_ids = (
-            daily_login_user_ids
-            | daily_compare_start_user_ids
-            | daily_coupon_event_user_ids
-            | daily_coupon_claim_user_ids
+        daily_active_user_ids = _period_active_user_ids(
+            db,
+            start_utc=day_start_utc,
+            end_utc=day_end_utc,
+            period_from=cur_date,
+            period_to=cur_date,
         )
         # 次日留存:cohort = 前一日(D-1)新增用户,留存 = 其中当日(D)活跃者(口径见上)。
         cohort_ids = _user_id_set(
@@ -357,18 +340,6 @@ def dashboard_overview(
             {
                 "date": cur_date,
                 "active_users": len(daily_active_user_ids),
-        trend_points.append(
-            {
-                "date": cur_date,
-                "active_users": len(
-                    _period_active_user_ids(
-                        db,
-                        start_utc=day_start_utc,
-                        end_utc=day_end_utc,
-                        period_from=cur_date,
-                        period_to=cur_date,
-                    )
-                ),
                 "new_users": _count(
                     User,
                     User.created_at >= day_start_utc,