From ad6a579ff8f22a5d218b31733dba94037d4c8fa5 Mon Sep 17 00:00:00 2001 From: lowmaster-chen <1119780489@qq.com> Date: Tue, 30 Jun 2026 15:50:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E5=A4=A7=E7=9B=98?= =?UTF-8?q?=E4=BA=AC=E4=B8=9C=20CPS=20=E4=BB=85=E7=BB=9F=E8=AE=A1=E5=AE=9E?= =?UTF-8?q?=E9=99=85=E4=BD=A3=E9=87=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/repositories/stats.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/app/admin/repositories/stats.py b/app/admin/repositories/stats.py index 2503c62..3e1e3bd 100644 --- a/app/admin/repositories/stats.py +++ b/app/admin/repositories/stats.py @@ -117,15 +117,6 @@ def _jd_valid_order(order: CpsOrder) -> bool: return bool(code and code not in JD_CPS_INVALID_CODES and code not in JD_CPS_UNPAID_CODES) -def _effective_commission_cents(order: CpsOrder) -> int: - if order.platform == "jd": - if order.actual_commission_cents not in (None, 0): - return order.actual_commission_cents or 0 - if order.estimated_commission_cents is not None: - return order.estimated_commission_cents or 0 - return order.commission_cents or 0 - - def dashboard_overview( db: Session, *, date_from: date | None = None, date_to: date | None = None ) -> dict: @@ -487,7 +478,10 @@ def dashboard_overview( "meituan_unknown_rate_count": period_meituan_unknown_rate_count, "meituan_hit_rate": period_meituan_hit_rate, "jd_order_count": len(period_jd_valid_orders), - "jd_commission_cents": sum(_effective_commission_cents(o) for o in period_jd_valid_orders), + # 数据大盘京东 CPS 只看实际佣金,不再用预估佣金兜底。 + "jd_commission_cents": sum( + o.actual_commission_cents or 0 for o in period_jd_valid_orders + ), "jd_actual_commission_cents": sum( o.actual_commission_cents or 0 for o in period_jd_valid_orders ),