feat: 接入京东联盟订单到数据大盘 (#90)
改了什么:新增京东联盟订单查询客户端、cps_order 京东字段迁移、CPS 对账接口 platform=all/jd、数据大盘京东订单与佣金聚合。 为什么改:数据大盘需要展示京东 CPS 真实订单佣金,不再保持占位。 验证方式:python -m pytest tests\\test_admin_read.py::test_dashboard_overview tests\\test_cps_admin.py::test_jd_reconcile_updates_dashboard -q;本地真实拉取 2026-06-27 京东订单 3 行,页面显示京东有效 1 单/佣金 ¥0.13。 --------- Co-authored-by: lowmaster-chen <1119780489@qq.com> Reviewed-on: #90 Co-authored-by: chenshuobo <chenshuobo@wonderable.ai> Co-committed-by: chenshuobo <chenshuobo@wonderable.ai>
This commit was merged in pull request #90.
This commit is contained in:
@@ -66,6 +66,7 @@ def test_dashboard_overview(admin_client: TestClient, admin_token: str) -> None:
|
||||
assert "success_rate" in data["comparison"]
|
||||
assert data["cps"]["available"] is True
|
||||
assert "meituan_order_count" in data["cps"]
|
||||
assert "jd_order_count" in data["cps"]
|
||||
|
||||
|
||||
def test_user_list_and_detail(admin_client: TestClient, admin_token: str) -> None:
|
||||
|
||||
@@ -11,6 +11,7 @@ from app.admin.repositories import admin_user as admin_repo
|
||||
from app.admin.repositories import cps as cps_repo
|
||||
from app.db.session import SessionLocal
|
||||
from app.models.cps_link import CpsClick
|
||||
from app.models.cps_order import CpsOrder
|
||||
from app.models.cps_wx_user import CpsWxUser
|
||||
from app.repositories import cps_link as cps_link_repo
|
||||
|
||||
@@ -180,3 +181,73 @@ def test_day_users_cross_year(admin_client: TestClient, admin_token: str) -> Non
|
||||
assert len(users) == 1
|
||||
assert users[0]["openid"] == openid
|
||||
assert users[0]["visit_count"] == 5 # 次年 01-01 那条被时间窗排除
|
||||
|
||||
|
||||
def test_jd_reconcile_updates_dashboard(
|
||||
admin_client: TestClient, admin_token: str, monkeypatch: pytest.MonkeyPatch
|
||||
) -> None:
|
||||
"""京东拉单:按订单行入库;大盘只统计有效 validCode 的佣金。"""
|
||||
|
||||
def fake_query_order_rows(**kwargs):
|
||||
start = kwargs["start_time"].astimezone(_BJ)
|
||||
if start.hour != 10 or kwargs["page_index"] != 1:
|
||||
return {"rows": [], "has_more": False}
|
||||
return {
|
||||
"rows": [
|
||||
{
|
||||
"id": "pytest-jd-row-valid",
|
||||
"orderId": "pytest-jd-order-1",
|
||||
"skuId": "sku-1",
|
||||
"skuName": "京东测试商品",
|
||||
"orderTime": "2026-06-25 10:10:00",
|
||||
"modifyTime": "2026-06-25 10:20:00",
|
||||
"validCode": "16",
|
||||
"estimateCosPrice": "19.90",
|
||||
"estimateFee": "1.23",
|
||||
"actualFee": "2.34",
|
||||
"commissionRate": "10.00",
|
||||
},
|
||||
{
|
||||
"id": "pytest-jd-row-invalid",
|
||||
"orderId": "pytest-jd-order-2",
|
||||
"skuId": "sku-2",
|
||||
"skuName": "京东无效订单",
|
||||
"orderTime": "2026-06-25 10:15:00",
|
||||
"modifyTime": "2026-06-25 10:25:00",
|
||||
"validCode": "4",
|
||||
"estimateCosPrice": "9.90",
|
||||
"estimateFee": "0.50",
|
||||
"commissionRate": "5.00",
|
||||
},
|
||||
],
|
||||
"has_more": False,
|
||||
}
|
||||
|
||||
monkeypatch.setattr("app.integrations.jd_union.query_order_rows", fake_query_order_rows)
|
||||
r = admin_client.post(
|
||||
"/admin/api/cps/orders/reconcile",
|
||||
params={
|
||||
"platform": "jd",
|
||||
"date_from": "2026-06-25",
|
||||
"date_to": "2026-06-25",
|
||||
"query_time_type": 1,
|
||||
},
|
||||
headers=_auth(admin_token),
|
||||
)
|
||||
assert r.status_code == 200, r.text
|
||||
assert r.json()["fetched"] == 2
|
||||
|
||||
with SessionLocal() as db:
|
||||
rows = db.query(CpsOrder).filter(CpsOrder.platform == "jd").all()
|
||||
assert len([o for o in rows if o.order_id.startswith("jd:pytest-jd-row")]) == 2
|
||||
|
||||
overview = admin_client.get(
|
||||
"/admin/api/stats/overview",
|
||||
params={"date_from": "2026-06-25", "date_to": "2026-06-25"},
|
||||
headers=_auth(admin_token),
|
||||
)
|
||||
assert overview.status_code == 200, overview.text
|
||||
cps = overview.json()["cps"]
|
||||
assert cps["jd_order_count"] >= 1
|
||||
assert cps["jd_commission_cents"] >= 234
|
||||
assert cps["jd_invalid_count"] >= 1
|
||||
|
||||
Reference in New Issue
Block a user