feat(link): customer_account_link 账号↔客户多对多——共享好友员工维度对齐云客
用户报「Lily 好友数 36,点进员工客户页只有 12」。真机探明根因:那 24 个 是共享客户(同一人加多个员工),云客 per-employee 各算一个;而 customer 表 PK=friend_id 全局单行、归属 last-wins,其他员工名下必然「消失」。 抓取器本身每员工都拿全了(日志 declared=36 rows=36),丢在入库模型层。 - 新表 customer_account_link(渠道×账号×客户一行,per-relation 快照: 昵称/备注/头像/手机号/收发计数/最近沟通/add_time/fromType/isDel) - 写:repos.upsert_customer 随档案同事务维护(所有好友抓取路径一处挂全); 新增 prune_customer_links 对账 - 读:/api/customers?owner_account_id= 改读 link(与云客 contacts_num 口径 一致);该账号 link 为空时回退档案路径(过渡安全);与 dept/user 等 过滤组合时维持旧行为;CustomerOut 透传 from_type - 抓取器:friends/wa-friends 逐员工整批 upsert 后按名单对账(取满声明 total 才删,防半份名单误删) - 前端:StaffFriends 数据来源列优先 link 的 from_type 611 测试绿(link 新 6 例);本地验证空表回退/造数接管/from_type 透传。 上线后需重跑 friends+wa-friends 回填 link(存量关系无法从档案反推)。 Co-Authored-By: Claude Code <noreply@anthropic.com>
This commit is contained in:
@@ -63,6 +63,7 @@ from sqlalchemy.orm import DeclarativeBase
|
||||
from app.db.models import (
|
||||
ChatGroup,
|
||||
Customer,
|
||||
CustomerAccountLink,
|
||||
Department,
|
||||
GroupMember,
|
||||
Media,
|
||||
@@ -83,6 +84,7 @@ __all__ = [
|
||||
"upsert_chat_group",
|
||||
"upsert_customer",
|
||||
"upsert_customers",
|
||||
"prune_customer_links",
|
||||
"upsert_department",
|
||||
"upsert_media",
|
||||
"upsert_messages",
|
||||
@@ -380,9 +382,34 @@ async def upsert_customer(session: AsyncSession, rec: dict[str, Any]) -> None:
|
||||
"""Idempotently upsert one :class:`Customer` (PK = ``friend_id``).
|
||||
|
||||
Same ``friend_id`` twice -> one row, with non-PK fields refreshed from the
|
||||
later record.
|
||||
later record. 同时维护 ``customer_account_link``(渠道×账号×客户一行,
|
||||
2026-09-08):customer 档案全局单行 last-wins,共享客户的其他员工关系
|
||||
靠 link 表保留;员工维度列表/计数读 link(对齐云客 per-employee 口径)。
|
||||
"""
|
||||
await _upsert_one(session, Customer, rec)
|
||||
owner = rec.get("owner_account_id")
|
||||
if owner:
|
||||
raw = rec.get("raw_json") or {}
|
||||
link_rec = {
|
||||
"channel": rec.get("channel"),
|
||||
"owner_account_id": owner,
|
||||
"friend_id": rec.get("friend_id"),
|
||||
"friend_nickname": rec.get("friend_nickname"),
|
||||
"friend_remark": rec.get("friend_remark"),
|
||||
"head_image_url": rec.get("head_image_url"),
|
||||
"real_name": rec.get("real_name"),
|
||||
"phone": rec.get("phone"),
|
||||
"last_chat_time": rec.get("last_chat_time"),
|
||||
"add_time": rec.get("add_time"),
|
||||
"send_num": rec.get("send_num"),
|
||||
"receive_num": rec.get("receive_num"),
|
||||
"message_count": rec.get("message_count"),
|
||||
"delete_flag": rec.get("delete_flag"),
|
||||
}
|
||||
# fromType 只在 raw_json(云客数据来源代码,员工客户页列)
|
||||
if isinstance(raw, dict) and raw.get("fromType") is not None:
|
||||
link_rec["from_type"] = raw.get("fromType")
|
||||
await _upsert_one(session, CustomerAccountLink, link_rec)
|
||||
|
||||
|
||||
async def upsert_customers(session: AsyncSession, recs: list[dict[str, Any]]) -> int:
|
||||
@@ -392,10 +419,33 @@ async def upsert_customers(session: AsyncSession, recs: list[dict[str, Any]]) ->
|
||||
single row (the last write wins) at the DB layer.
|
||||
"""
|
||||
for rec in recs:
|
||||
await _upsert_one(session, Customer, rec)
|
||||
await upsert_customer(session, rec)
|
||||
return len(recs)
|
||||
|
||||
|
||||
async def prune_customer_links(
|
||||
session: AsyncSession,
|
||||
*,
|
||||
channel: str,
|
||||
owner_account_id: str,
|
||||
keep_friend_ids: list[str],
|
||||
) -> int:
|
||||
"""删除该账号名下**不在最新名单**里的 customer_account_link 行。
|
||||
|
||||
云客 isDel=0 只返回当前好友;抓取器逐员工整批 upsert 后调用本函数对账
|
||||
(离开名单=已不是好友,或好友转移)。**调用方必须保证名单完整**(翻满
|
||||
声明 total)再调——拿到半份名单就 prune 会误删。返回删除行数。
|
||||
"""
|
||||
conditions = [
|
||||
CustomerAccountLink.channel == channel,
|
||||
CustomerAccountLink.owner_account_id == owner_account_id,
|
||||
]
|
||||
if keep_friend_ids:
|
||||
conditions.append(CustomerAccountLink.friend_id.not_in(keep_friend_ids))
|
||||
result = await session.execute(sa.delete(CustomerAccountLink).where(*conditions))
|
||||
return int(result.rowcount or 0)
|
||||
|
||||
|
||||
async def upsert_messages(session: AsyncSession, recs: list[dict[str, Any]]) -> int:
|
||||
"""Batch idempotent upsert for :class:`Message` (PK = ``msg_id``).
|
||||
|
||||
|
||||
Reference in New Issue
Block a user