fix: 数据大盘京东 CPS 仅统计实际佣金

This commit is contained in:
lowmaster-chen
2026-06-30 15:50:32 +08:00
parent 08a16c7632
commit ad6a579ff8
+4 -10
View File
@@ -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
),