1

2026-06-15 16:42:33 +08:00
parent e1e9bf9aca
commit 937ffc4320
6 changed files with 213 additions and 82 deletions
@@ -1147,10 +1147,6 @@ async def get_stats(
    start_date: str = Query(None),
    end_date: str = Query(None),
 ):
-    total_users = (await db.execute(
-        select(func.count(User.id)).where(User.user_type == "frontend")
-    )).scalar() or 0
-    
    today_start = datetime.now().replace(hour=0, minute=0, second=0, microsecond=0)
    
    try:
@@ -1167,6 +1163,14 @@ async def get_stats(
        date_start = today_start
        date_end = datetime.now()

+    total_users = (await db.execute(
+        select(func.count(User.id)).where(
+            User.user_type == "frontend",
+            User.created_at >= date_start,
+            User.created_at <= date_end,
+        )
+    )).scalar() or 0
+
    total_projects = (await db.execute(
        select(func.count(Project.id)).where(
            Project.deleted_at.is_(None),
@@ -1224,6 +1228,58 @@ async def get_stats(
        )
    )).scalar() or 0

+    period_duration = date_end - date_start
+    
+    last_period_start = date_start - period_duration
+    last_period_end = date_start
+
+    last_period_users = (await db.execute(
+        select(func.count(User.id)).where(
+            User.user_type == "frontend",
+            User.created_at >= last_period_start,
+            User.created_at <= last_period_end,
+        )
+    )).scalar() or 0
+
+    last_period_projects = (await db.execute(
+        select(func.count(Project.id)).where(
+            Project.deleted_at.is_(None),
+            Project.created_at >= last_period_start,
+            Project.created_at <= last_period_end,
+        )
+    )).scalar() or 0
+
+    last_period_generations = (await db.execute(
+        select(func.count(ChatGenerationTask.id)).where(
+            ChatGenerationTask.created_at >= last_period_start,
+            ChatGenerationTask.created_at <= last_period_end,
+        )
+    )).scalar() or 0
+
+    last_period_records = (await db.execute(
+        select(func.count(GenerationRecord.id)).where(
+            GenerationRecord.deleted_at.is_(None),
+            GenerationRecord.created_at >= last_period_start,
+            GenerationRecord.created_at <= last_period_end,
+        )
+    )).scalar() or 0
+
+    last_period_revenue = (await db.execute(
+        select(func.coalesce(func.sum(PaymentOrder.amount), 0)).where(
+            PaymentOrder.status == "paid",
+            PaymentOrder.created_at >= last_period_start,
+            PaymentOrder.created_at <= last_period_end,
+        )
+    )).scalar() or 0
+
+    last_period_credits_consumed = (await db.execute(
+        select(func.coalesce(func.sum(func.abs(CreditRecord.amount)), 0)).where(
+            CreditRecord.type == "consume",
+            CreditRecord.created_at >= last_period_start,
+            CreditRecord.created_at <= last_period_end,
+        )
+    )).scalar() or 0
+
    return AdminStatsOut(
        total_users=total_users,
        total_projects=total_projects,
@@ -1233,6 +1289,12 @@ async def get_stats(
        credits_consumed_today=float(credits_consumed),
        today_alipay_revenue=float(alipay_revenue),
        today_wechat_revenue=float(wechat_revenue),
+        last_period_users=last_period_users,
+        last_period_projects=last_period_projects,
+        last_period_generations=last_period_generations,
+        last_period_records=last_period_records,
+        last_period_revenue=float(last_period_revenue),
+        last_period_credits_consumed=float(last_period_credits_consumed),
    )