Files
yunke/yunke-server/app/api/routers/customer.py
T
浅念 a290e39523 feat(customers): 发送/接收列改今日口径(对齐云客;本地消息表Asia/Shanghai今日聚合)
- CustomerOut 加 send_today/receive_today(路由赋值,非ORM列)
- /api/customers 每页一次 GROUP BY(owner IN 走复合索引前缀)
- 前端列优先今日值,无消息数据回退原raw字段;列名对齐云客「发送条数/接收条数」
- TDD:今日3发2收+昨日不计入+无消息客户0

Co-Authored-By: Claude <noreply@anthropic.com>
2026-08-22 14:39:17 +08:00

155 lines
5.9 KiB
Python

"""GET /api/customers — paginated, filterable customer list.
Read-only query over the mirrored ``customer`` table. Supports filtering by
``channel``, ``owner_account_id``, ``user_id``, ``add_time_since`` and
``last_chat_since`` (direct columns) and ``department_id`` (resolved through
``customer.user_id`` -> ``staff.dept_id``). Results are ordered by
``last_chat_time desc`` (nulls last) then ``friend_id`` so the
most-recently-active contacts surface first.
"""
from __future__ import annotations
from typing import Annotated
import sqlalchemy as sa
from fastapi import APIRouter, Depends, Query
from sqlalchemy.ext.asyncio import AsyncSession
from app.api.deps import get_session
from app.api.schemas import CustomerOut, Page
from app.db.models import Customer, Staff, WechatAccount
router = APIRouter(prefix="/api", tags=["customers"])
SessionDep = Annotated[AsyncSession, Depends(get_session)]
PageParam = Annotated[int, Query(ge=1)]
PageSizeParam = Annotated[int, Query(ge=1, le=100)]
@router.get("/customers/declared-total")
async def customers_declared_total(session: SessionDep) -> dict:
"""云客口径的客户合计(分渠道)= Σ 员工账号表的 contacts_num 声明值。
云客列表的页脚数字含 ES 索引重复条目(实测 csf 员工声明 1999 vs 真实
distinct 1449,连行 id 都相同的重复 doc,2026-08-20;WA 同理 11931 vs
8674);本地表存去重真实客户,此端点把「与云客页脚一字不差」的声明口径
给前端展示。
"""
from app.db.models import WhatsappAccount
wechat = (
await session.execute(
sa.select(
sa.func.coalesce(sa.func.sum(WechatAccount.contacts_num), 0),
sa.func.count(WechatAccount.contacts_num),
)
)
).one()
whatsapp = (
await session.execute(
sa.select(
sa.func.coalesce(sa.func.sum(WhatsappAccount.contacts_num), 0),
sa.func.count(WhatsappAccount.contacts_num),
)
)
).one()
return {
"wechat": {"declared_total": int(wechat[0]), "account_count": int(wechat[1])},
"whatsapp": {"declared_total": int(whatsapp[0]), "account_count": int(whatsapp[1])},
}
@router.get("/customers")
async def list_customers(
session: SessionDep,
page: PageParam = 1,
page_size: PageSizeParam = 20,
channel: Annotated[str | None, Query()] = None,
department_id: Annotated[str | None, Query()] = None,
owner_account_id: Annotated[str | None, Query()] = None,
friend_id: Annotated[str | None, Query()] = None,
user_id: Annotated[str | None, Query()] = None,
add_time_since: Annotated[int | None, Query(ge=0)] = None,
last_chat_since: Annotated[int | None, Query(ge=0)] = None,
) -> Page[CustomerOut]:
"""List customers with optional filters and pagination."""
conditions = []
if channel is not None:
conditions.append(Customer.channel == channel)
if owner_account_id is not None:
conditions.append(Customer.owner_account_id == owner_account_id)
if department_id is not None:
# Customer has no dept column; resolve via the owning staff member.
dept_user_ids = sa.select(Staff.user_id).where(
Staff.dept_id == department_id
)
conditions.append(Customer.user_id.in_(dept_user_ids))
if friend_id is not None:
conditions.append(Customer.friend_id == friend_id)
if user_id is not None:
conditions.append(Customer.user_id == user_id)
if add_time_since is not None:
conditions.append(Customer.add_time >= add_time_since)
if last_chat_since is not None:
conditions.append(Customer.last_chat_time >= last_chat_since)
total_stmt = sa.select(sa.func.count()).select_from(Customer)
if conditions:
total_stmt = total_stmt.where(*conditions)
total = (await session.execute(total_stmt)).scalar_one()
list_stmt = sa.select(Customer)
if conditions:
list_stmt = list_stmt.where(*conditions)
list_stmt = (
list_stmt.order_by(
sa.nullslast(Customer.last_chat_time.desc()),
Customer.friend_id.asc(),
)
.limit(page_size)
.offset((page - 1) * page_size)
)
rows = (await session.execute(list_stmt)).scalars().all()
# 今日发送/接收条数(对齐云客口径):本地消息表按 Asia/Shanghai 今日聚合,
# 一次 GROUP BY 覆盖本页(owner IN 走 ix_message_channel_owner_talker_time 前缀)
import datetime as _dt
from app.db.models import Message
sh_now = _dt.datetime.now(_dt.UTC) + _dt.timedelta(hours=8)
today_start_ms = int(
(sh_now.replace(hour=0, minute=0, second=0, microsecond=0) - _dt.timedelta(hours=8)).timestamp() * 1000
)
owners = sorted({r.owner_account_id for r in rows if r.owner_account_id})
today_counts: dict[tuple[str, str], tuple[int, int]] = {}
if owners:
stat_rows = (
await session.execute(
sa.select(
Message.owner_account_id,
Message.talker_id,
sa.func.sum(sa.case((Message.is_send.is_(True), 1), else_=0)),
sa.func.sum(sa.case((Message.is_send.is_(False), 1), else_=0)),
)
.where(
Message.channel == (channel or "wechat"),
Message.owner_account_id.in_(owners),
Message.timestamp >= today_start_ms,
)
.group_by(Message.owner_account_id, Message.talker_id)
)
).all()
today_counts = {(o, t): (int(s or 0), int(rc or 0)) for o, t, s, rc in stat_rows}
items = []
for row in rows:
item = CustomerOut.model_validate(row)
s, rc = today_counts.get((row.owner_account_id or "", row.friend_id or ""), (0, 0))
item.send_today = s
item.receive_today = rc
items.append(item)
return Page(items=items, total=total, page=page, page_size=page_size)