feat(customers): 微信客户页脚改云客口径(Σ员工好友数声明值8590,用户选B方案)
- GET /api/customers/declared-total: Σ wechat_account.contacts_num - 页脚优先显示云客口径(回退真实total);列表内容保持去重真实行 - 云客列表声明值含其ES索引重复doc(连行id都相同无法物理区分),仅对齐计数 Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -18,7 +18,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
|
|||||||
|
|
||||||
from app.api.deps import get_session
|
from app.api.deps import get_session
|
||||||
from app.api.schemas import CustomerOut, Page
|
from app.api.schemas import CustomerOut, Page
|
||||||
from app.db.models import Customer, Staff
|
from app.db.models import Customer, Staff, WechatAccount
|
||||||
|
|
||||||
router = APIRouter(prefix="/api", tags=["customers"])
|
router = APIRouter(prefix="/api", tags=["customers"])
|
||||||
|
|
||||||
@@ -27,6 +27,28 @@ PageParam = Annotated[int, Query(ge=1)]
|
|||||||
PageSizeParam = Annotated[int, Query(ge=1, le=100)]
|
PageSizeParam = Annotated[int, Query(ge=1, le=100)]
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/customers/declared-total")
|
||||||
|
async def customers_declared_total(session: SessionDep) -> dict:
|
||||||
|
"""云客口径的微信客户合计 = Σ wechat_account.contacts_num。
|
||||||
|
|
||||||
|
云客列表的页脚数字含 ES 索引重复条目(实测 csf 员工声明 1999 vs 真实
|
||||||
|
distinct 1449,连行 id 都相同的重复 doc,2026-08-20);本地表存去重真实
|
||||||
|
客户,此端点把「与云客页脚一字不差」的声明口径给前端展示。
|
||||||
|
"""
|
||||||
|
row = (
|
||||||
|
await session.execute(
|
||||||
|
sa.select(
|
||||||
|
sa.func.coalesce(sa.func.sum(WechatAccount.contacts_num), 0),
|
||||||
|
sa.func.count(WechatAccount.contacts_num),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
).one()
|
||||||
|
return {
|
||||||
|
"declared_total": int(row[0]),
|
||||||
|
"account_count": int(row[1]),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@router.get("/customers")
|
@router.get("/customers")
|
||||||
async def list_customers(
|
async def list_customers(
|
||||||
session: SessionDep,
|
session: SessionDep,
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# GET /api/customers/declared-total — 云客口径合计(页脚对齐云客显示,2026-08-20)
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
async def _seed_accounts_for_declared(session):
|
||||||
|
from app.db.models import WechatAccount
|
||||||
|
|
||||||
|
session.add_all([
|
||||||
|
WechatAccount(wx_id="w1", contacts_num=100),
|
||||||
|
WechatAccount(wx_id="w2", contacts_num=23),
|
||||||
|
WechatAccount(wx_id="w3", contacts_num=None),
|
||||||
|
])
|
||||||
|
await session.commit()
|
||||||
|
|
||||||
|
|
||||||
|
async def test_declared_total_sums_contacts_num(make_client):
|
||||||
|
"""declared_total = Σ wechat_account.contacts_num(云客声明的含重复口径)。"""
|
||||||
|
client = await make_client(_seed_accounts_for_declared)
|
||||||
|
r = await client.get("/api/customers/declared-total")
|
||||||
|
assert r.status_code == 200
|
||||||
|
body = r.json()
|
||||||
|
assert body["declared_total"] == 123
|
||||||
|
assert body["account_count"] == 2 # 只计有值的员工
|
||||||
@@ -48,6 +48,10 @@ export interface CustomerQuery {
|
|||||||
last_chat_since?: number
|
last_chat_since?: number
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function getCustomerDeclaredTotal(): Promise<{ declared_total: number; account_count: number }> {
|
||||||
|
return getJson<{ declared_total: number; account_count: number }>('/customers/declared-total')
|
||||||
|
}
|
||||||
|
|
||||||
export function getCustomers(query: CustomerQuery = {}): Promise<Page<Customer>> {
|
export function getCustomers(query: CustomerQuery = {}): Promise<Page<Customer>> {
|
||||||
return getJson<Page<Customer>>(
|
return getJson<Page<Customer>>(
|
||||||
'/customers',
|
'/customers',
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { computed, onMounted, reactive, ref, watch } from 'vue'
|
|||||||
import { useRoute, useRouter } from 'vue-router'
|
import { useRoute, useRouter } from 'vue-router'
|
||||||
import { ElMessage } from 'element-plus'
|
import { ElMessage } from 'element-plus'
|
||||||
import { Download } from '@element-plus/icons-vue'
|
import { Download } from '@element-plus/icons-vue'
|
||||||
import { getCustomers } from '@/api'
|
import { getCustomerDeclaredTotal, getCustomers } from '@/api'
|
||||||
import { downloadBlob } from '@/api/client'
|
import { downloadBlob } from '@/api/client'
|
||||||
import type { Channel, Customer } from '@/api/types'
|
import type { Channel, Customer } from '@/api/types'
|
||||||
import { useChannelStore } from '@/stores/channel'
|
import { useChannelStore } from '@/stores/channel'
|
||||||
@@ -39,6 +39,18 @@ function freshTabState(): TabState {
|
|||||||
return { items: [], total: 0, page: 1, pageSize: 10, loading: false, errorMsg: null, loaded: false }
|
return { items: [], total: 0, page: 1, pageSize: 10, loading: false, errorMsg: null, loaded: false }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** 云客口径微信客户合计(Σ员工好友数声明值,含云客索引重复;页脚对齐云客)。 */
|
||||||
|
const declaredTotal = ref<number | null>(null)
|
||||||
|
|
||||||
|
async function loadDeclaredTotal(): Promise<void> {
|
||||||
|
try {
|
||||||
|
const r = await getCustomerDeclaredTotal()
|
||||||
|
declaredTotal.value = r.declared_total
|
||||||
|
} catch {
|
||||||
|
declaredTotal.value = null // 回退真实 total
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const channelStore = useChannelStore()
|
const channelStore = useChannelStore()
|
||||||
@@ -346,6 +358,7 @@ watch(
|
|||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
loadTab(activeTab.value)
|
loadTab(activeTab.value)
|
||||||
|
loadDeclaredTotal()
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -355,7 +368,7 @@ onMounted(() => {
|
|||||||
<div>
|
<div>
|
||||||
<h2 style="margin: 0 0 4px; font-size: 16px">{{ activeTab === 'wechat' ? '微信' : 'WhatsApp' }}客户列表</h2>
|
<h2 style="margin: 0 0 4px; font-size: 16px">{{ activeTab === 'wechat' ? '微信' : 'WhatsApp' }}客户列表</h2>
|
||||||
<span class="yk-customers__sub">
|
<span class="yk-customers__sub">
|
||||||
共 {{ tabState[activeTab].total }} 条
|
共 {{ activeTab === 'wechat' && declaredTotal !== null ? declaredTotal : tabState[activeTab].total }} 条
|
||||||
<template v-if="departmentName"> · 部门:{{ departmentName }}</template>
|
<template v-if="departmentName"> · 部门:{{ departmentName }}</template>
|
||||||
<template v-if="ownerId"> · 员工账号:{{ ownerId }}</template>
|
<template v-if="ownerId"> · 员工账号:{{ ownerId }}</template>
|
||||||
</span>
|
</span>
|
||||||
|
|||||||
Reference in New Issue
Block a user