1、修复后台首页数据概览的团队积分消耗排行情况

2、修复后台交易流水数据
2026-08-05 11:59:27 +08:00
parent 517bcc3531
commit a55d4d649c
5 changed files with 236 additions and 53 deletions
@@ -1811,20 +1811,45 @@ async def get_stats(
        )
    )).scalar() or 0

-    # 预扣占用不是实际消费；历史流水 charge_action 为空时仍按真实扣费兼容。
+    # 消费类（真实扣费 + 预扣占用）：charge_action 为空时仍按真实扣费兼容；hold 为预扣占用。
+    credit_charge_action_filter = or_(
+        CreditRecord.charge_action.is_(None),
+        CreditRecord.charge_action == "charge",
+        CreditRecord.charge_action == "hold",
+    )
+    # 「仅真实扣费」filter 用于图表、模型使用次数等需要按实际产出（非预扣）统计的场景。
    real_credit_charge_filter = or_(
        CreditRecord.charge_action.is_(None),
        CreditRecord.charge_action == "charge",
    )

-    credits_consumed = (await db.execute(
-        select(func.coalesce(func.sum(func.abs(CreditRecord.amount)), 0)).where(
-            CreditRecord.type == "consume",
-            real_credit_charge_filter,
+    # 核心数据「消耗积分」= 净消耗 = 真实消费 + 预扣占用 - 真实退款 - 预扣释放。
+    # 说明：
+    #   hold（预扣占用）：type=consume，charge_action='hold'，amount<0
+    #   hold_release（预扣释放退回）：type=refund，charge_action='hold_release'，amount>0
+    #     （账本 L256 强校验：hold_release.type 必须是 'refund'，不是 consume）
+    #   charge（真实扣费）：type=consume，charge_action='charge' 或 NULL(历史)，amount<0
+    #   refund（真实退款）：type=refund，charge_action='refund' 或 NULL(历史兼容)，amount>0
+    # 因此 type=refund 天然包含「真实退款 + 预扣释放退回」两类子流水。
+    _stats_real_and_hold = case(
+        (and_(CreditRecord.type == "consume", credit_charge_action_filter), func.abs(CreditRecord.amount)),
+        else_=0,
+    )
+    _stats_refund_and_release = case(
+        (CreditRecord.type == "refund", func.abs(CreditRecord.amount)),
+        else_=0,
+    )
+    _net_row = (await db.execute(
+        select(
+            func.coalesce(func.sum(_stats_real_and_hold), 0),
+            func.coalesce(func.sum(_stats_refund_and_release), 0),
+        ).where(
+            CreditRecord.type.in_(["consume", "refund"]),
            CreditRecord.created_at >= date_start,
            CreditRecord.created_at <= date_end,
        )
-    )).scalar() or 0
+    )).one()
+    credits_consumed = round(max(float(_net_row[0] or 0) - float(_net_row[1] or 0), 0.0), 2)

    alipay_revenue = (await db.execute(
        select(func.coalesce(func.sum(PaymentOrder.amount), 0)).where(
@@ -1888,14 +1913,19 @@ async def get_stats(
        )
    )).scalar() or 0

-    last_period_credits_consumed = (await db.execute(
-        select(func.coalesce(func.sum(func.abs(CreditRecord.amount)), 0)).where(
-            CreditRecord.type == "consume",
-            real_credit_charge_filter,
+    last_period_net_row = (await db.execute(
+        select(
+            func.coalesce(func.sum(_stats_real_and_hold), 0),
+            func.coalesce(func.sum(_stats_refund_and_release), 0),
+        ).where(
+            CreditRecord.type.in_(["consume", "refund"]),
            CreditRecord.created_at >= last_period_start,
            CreditRecord.created_at <= last_period_end,
        )
-    )).scalar() or 0
+    )).one()
+    last_period_credits_consumed = round(
+        max(float(last_period_net_row[0] or 0) - float(last_period_net_row[1] or 0), 0.0), 2,
+    )

    # ── 每日各模块积分消耗（始终返回选中日期往前7天，便于图表展示）
    # 把 timestamptz 按东八区（业务时区）偏移后再转 DATE，
@@ -1963,22 +1993,25 @@ async def get_stats(
    ]

    # ── 各团队积分消耗（有团队 vs 无团队，使用流水中的团队快照）
-    # 净消耗 = 实际消费（charge_action IS NULL 或 charge） - 退款（charge_action=refund 不限制）
-    # 注意：real_credit_charge_filter 仅应限制 consume 类型（预扣 hold 释放不算真实消费）；
-    #       refund 类型的 charge_action = 'refund'，不能套用同一个 filter，
-    #       所以把该 filter 下移到 CASE WHEN 内而不是写在 WHERE 中，避免退款被误过滤。
-    _consume_filter = and_(
+    # 净消耗 = (真实消费 charge + 预扣占用 hold) - (真实退款 refund + 预扣释放 hold_release)
+    # 注意：
+    #   hold（预扣占用）：type=consume，charge_action='hold'，amount<0 → 加项
+    #   hold_release（预扣释放）：type=refund，charge_action='hold_release'，amount>0 → 减项（type=refund 天然包含）
+    #   charge（真实扣费）：type=consume，charge/NULL → 加项
+    #   refund（真实退款）：type=refund，refund/NULL → 减项
+    _charge_hold_filter = and_(
        CreditRecord.type == "consume",
-        real_credit_charge_filter,
+        credit_charge_action_filter,  # charge / hold / NULL(历史 charge)
    )
-    _consume_expr = case((_consume_filter, func.abs(CreditRecord.amount)), else_=0)
-    _refund_expr = case((CreditRecord.type == "refund", func.abs(CreditRecord.amount)), else_=0)
+    _charge_hold_expr = case((_charge_hold_filter, func.abs(CreditRecord.amount)), else_=0)
+    # type=refund = 真实退款 + 预扣释放退回（账本强制 hold_release.type=refund）
+    _refund_release_expr = case((CreditRecord.type == "refund", func.abs(CreditRecord.amount)), else_=0)
    team_credit_rows = (await db.execute(
        select(
            func.coalesce(CreditRecord.team_name_snapshot, '未分配团队').label('team_name'),
            CreditRecord.team_id_snapshot.label('team_id'),
-            func.coalesce(func.sum(_consume_expr), 0).label("total_consume"),
-            func.coalesce(func.sum(_refund_expr), 0).label("total_refund"),
+            func.coalesce(func.sum(_charge_hold_expr), 0).label("total_charge_hold"),
+            func.coalesce(func.sum(_refund_release_expr), 0).label("total_refund_release"),
        )
        .where(
            CreditRecord.type.in_(["consume", "refund"]),
@@ -1986,14 +2019,14 @@ async def get_stats(
            CreditRecord.created_at <= date_end,
        )
        .group_by(CreditRecord.team_id_snapshot, CreditRecord.team_name_snapshot)
-        # 按"净消耗 = 总消费 - 总退款"倒序排序（排行榜）
-        .order_by((func.coalesce(func.sum(_consume_expr), 0) - func.coalesce(func.sum(_refund_expr), 0)).desc())
+        # 按"净消耗 = 真实+预扣 - 退款+释放"倒序排序（排行榜）
+        .order_by((func.coalesce(func.sum(_charge_hold_expr), 0) - func.coalesce(func.sum(_refund_release_expr), 0)).desc())
    )).all()
    credits_by_team = [
        TeamCreditOut(
            team_name=row.team_name,
            team_id=row.team_id,
-            credits=round(float(row.total_consume or 0) - float(row.total_refund or 0), 2),
+            credits=round(max(float(row.total_charge_hold or 0) - float(row.total_refund_release or 0), 0.0), 2),
        )
        for row in team_credit_rows
    ]