feat: 2026-04-15~04-20 累积变更基线 — 多主线合流
主线 1: rns1-customer-coach-api + 04-miniapp-core-business 后端实施
- 新增 GET /xcx/coaches/{id}/banner 轻量接口
- performance/records 加 coach_id 参数 + view_board_coach 权限分流
- coach/customer/performance/board/task 服务层重构
- fdw_queries 结算单粒度聚合 + consumption_summary 视图统一
- task_generator 回访宽限 72h + UPSERT 替代策略 + Step 5 保底清理
- recall_detector settle_type=3 双重限制 + 门店级 resolved
主线 2: 小程序权限分流 + 新增 coach-service-records 管理者视角业绩明细页
- perf-progress 共享模块去重 task-list/coach-detail 动画逻辑
- isScattered 散客标记端到端
- foodDetail/phoneFull/creator* 字段透传
主线 3: P19 指数回测框架 Phase 1+2
- 3 个指数表 stat_date 日快照模式
- 新增 DWS_INDEX_BACKFILL / DWS_TASK_SIMULATION 工具任务
- task_engine 升级 HTTP 实时 + 推演回测双模式
主线 4: Core 维度层启用
- 新增 CORE_DIM_SYNC 任务(DWD → core 4 维度表)
- 修复 app 视图空查询问题
主线 5: member_project_tag 改为 LAST_30_VISITS 消费次数窗口
主线 6: 2 个迁移 SQL 已执行(stat_date + member_project_tag 新窗口)
- schema 基线与 DDL 快照同步
主线 7: 开发机路径迁移 C:\NeoZQYY → C:\Project\NeoZQYY(约 95% 改动量)
附带: 新建运维脚本(churned_customer_report / simulate_historical_tasks /
backfill_index_snapshots)+ tools/task-analysis/ 任务分析工具
合计 157 文件。未包含中间产物(tmp/ .playwright-mcp/ inspect-* excel/sheet 分析 txt)。
审计记录见下一个 commit。
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -12,6 +12,10 @@ CHANGE 2026-04-08 | Fix-13 改造:
|
||||
- 扫描范围从"有 active 任务的客户"扩大为"所有 os_label='MAIN' 的关联客户"
|
||||
- 新增 recall_events 事件表记录广义召回(按天去重)
|
||||
- 无 active 任务的客户到店也生成 follow_up_visit
|
||||
|
||||
CHANGE 2026-04-12 | 召回完成逻辑调整:
|
||||
- settle_type=3 仅计入有 BONUS 服务的订单(纯商品不算到店)
|
||||
- 门店级召回解除:客户到店后,未服务助教的召回任务标记 resolved
|
||||
"""
|
||||
|
||||
import json
|
||||
@@ -72,6 +76,7 @@ def run(payload: dict | None = None, job_id: int | None = None) -> dict:
|
||||
"""
|
||||
completed_count = 0
|
||||
event_count = 0
|
||||
resolved_count = 0
|
||||
|
||||
conn = _get_connection()
|
||||
try:
|
||||
@@ -89,6 +94,7 @@ def run(payload: dict | None = None, job_id: int | None = None) -> dict:
|
||||
result = _process_site(conn, site_id)
|
||||
completed_count += result["completed"]
|
||||
event_count += result["events"]
|
||||
resolved_count += result["resolved"]
|
||||
except Exception:
|
||||
logger.exception(
|
||||
"处理门店召回检测失败: site_id=%s", site_id
|
||||
@@ -108,10 +114,14 @@ def run(payload: dict | None = None, job_id: int | None = None) -> dict:
|
||||
conn.close()
|
||||
|
||||
logger.info(
|
||||
"召回完成检测完成: completed_count=%d, event_count=%d",
|
||||
completed_count, event_count,
|
||||
"召回完成检测完成: completed=%d, events=%d, resolved=%d",
|
||||
completed_count, event_count, resolved_count,
|
||||
)
|
||||
return {"completed_count": completed_count, "event_count": event_count}
|
||||
return {
|
||||
"completed_count": completed_count,
|
||||
"event_count": event_count,
|
||||
"resolved_count": resolved_count,
|
||||
}
|
||||
|
||||
|
||||
def _process_site(conn, site_id: int) -> dict:
|
||||
@@ -122,9 +132,13 @@ def _process_site(conn, site_id: int) -> dict:
|
||||
1. 从 ETL 查询所有 os_label='MAIN' 的 (assistant_id, member_id) 对
|
||||
2. 批量查询这些客户的最新结算记录
|
||||
3. 对每个有新结算的关系对:写 recall_events + 完成任务 + 生成回访
|
||||
|
||||
CHANGE 2026-04-12 | 门店级召回解除:
|
||||
4. 客户到店后,未被服务的助教的召回任务标记 resolved
|
||||
"""
|
||||
completed = 0
|
||||
events = 0
|
||||
resolved = 0
|
||||
|
||||
from app.services.fdw_queries import _fdw_context
|
||||
|
||||
@@ -140,13 +154,15 @@ def _process_site(conn, site_id: int) -> dict:
|
||||
main_pairs = [(r[0], r[1]) for r in cur.fetchall()]
|
||||
|
||||
if not main_pairs:
|
||||
return {"completed": 0, "events": 0}
|
||||
return {"completed": 0, "events": 0, "resolved": 0}
|
||||
|
||||
# ── 2. 批量查询这些客户的最新结算时间 ──
|
||||
member_ids = list({mid for _, mid in main_pairs})
|
||||
settlement_map: dict[tuple[int, int], object] = {} # (assistant_id, member_id) → latest_pay_time
|
||||
|
||||
with _fdw_context(conn, site_id) as cur:
|
||||
# 助教级结算(用于狭义完成判定)
|
||||
# settle_type=1 全部计入;settle_type=3 仅计入有 BONUS 服务的
|
||||
cur.execute(
|
||||
"""
|
||||
SELECT sl.site_assistant_id AS assistant_id,
|
||||
@@ -157,7 +173,10 @@ def _process_site(conn, site_id: int) -> dict:
|
||||
ON sl.order_settle_id = sh.order_settle_id
|
||||
AND sl.is_delete = 0
|
||||
WHERE sh.member_id = ANY(%s)
|
||||
AND sh.settle_type IN (1, 3)
|
||||
AND (
|
||||
sh.settle_type = 1
|
||||
OR (sh.settle_type = 3 AND sl.order_assistant_type = 2)
|
||||
)
|
||||
GROUP BY sl.site_assistant_id, sh.member_id
|
||||
""",
|
||||
(member_ids,),
|
||||
@@ -165,6 +184,29 @@ def _process_site(conn, site_id: int) -> dict:
|
||||
for row in cur.fetchall():
|
||||
settlement_map[(row[0], row[1])] = row[2]
|
||||
|
||||
# 门店级到店检测(含无助教服务的 settle_type=1,用于 resolved 判定)
|
||||
cur.execute(
|
||||
"""
|
||||
SELECT sh.member_id, MAX(sh.pay_time) AS latest_pay_time
|
||||
FROM app.v_dwd_settlement_head sh
|
||||
WHERE sh.member_id = ANY(%s)
|
||||
AND (
|
||||
sh.settle_type = 1
|
||||
OR (sh.settle_type = 3 AND EXISTS (
|
||||
SELECT 1 FROM app.v_dwd_assistant_service_log sl
|
||||
WHERE sl.order_settle_id = sh.order_settle_id
|
||||
AND sl.is_delete = 0
|
||||
AND sl.order_assistant_type = 2
|
||||
))
|
||||
)
|
||||
GROUP BY sh.member_id
|
||||
""",
|
||||
(member_ids,),
|
||||
)
|
||||
member_visited_map = {}
|
||||
for row in cur.fetchall():
|
||||
member_visited_map[row[0]] = row[1]
|
||||
|
||||
# ── 3. 获取本门店所有 active 的召回/回访任务(用于匹配) ──
|
||||
active_tasks_map: dict[tuple[int, int], list] = {} # (assistant_id, member_id) → [(id, task_type, created_at)]
|
||||
with conn.cursor() as cur:
|
||||
@@ -207,7 +249,56 @@ def _process_site(conn, site_id: int) -> dict:
|
||||
)
|
||||
conn.rollback()
|
||||
|
||||
return {"completed": completed, "events": events}
|
||||
# ── 5. 门店级召回解除:客户到店后,未被服务的助教任务标记 resolved ──
|
||||
# 服务助教的任务已在 Step 4 中 completed(committed),
|
||||
# 此处查到的 active 召回任务是未被服务的助教持有的
|
||||
for member_id, pay_time in member_visited_map.items():
|
||||
try:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute("BEGIN")
|
||||
cur.execute(
|
||||
"""
|
||||
SELECT id, assistant_id, task_type, created_at
|
||||
FROM biz.coach_tasks
|
||||
WHERE site_id = %s AND member_id = %s
|
||||
AND status = 'active'
|
||||
AND task_type IN ('high_priority_recall', 'priority_recall')
|
||||
AND created_at < %s
|
||||
""",
|
||||
(site_id, member_id, pay_time),
|
||||
)
|
||||
remaining = cur.fetchall()
|
||||
for task_id, aid, task_type, _ in remaining:
|
||||
cur.execute(
|
||||
"""
|
||||
UPDATE biz.coach_tasks
|
||||
SET status = 'resolved', updated_at = NOW()
|
||||
WHERE id = %s AND status = 'active'
|
||||
""",
|
||||
(task_id,),
|
||||
)
|
||||
_insert_history(
|
||||
cur, task_id,
|
||||
action="customer_returned",
|
||||
old_status="active",
|
||||
new_status="resolved",
|
||||
old_task_type=task_type,
|
||||
new_task_type=task_type,
|
||||
detail={
|
||||
"reason": "customer_visited_store",
|
||||
"service_time": str(pay_time),
|
||||
},
|
||||
)
|
||||
resolved += 1
|
||||
conn.commit()
|
||||
except Exception:
|
||||
logger.exception(
|
||||
"门店级召回解除失败: site_id=%s, member_id=%s",
|
||||
site_id, member_id,
|
||||
)
|
||||
conn.rollback()
|
||||
|
||||
return {"completed": completed, "events": events, "resolved": resolved}
|
||||
|
||||
|
||||
def _process_pair(
|
||||
@@ -224,7 +315,7 @@ def _process_pair(
|
||||
CHANGE 2026-04-08 | Fix-13 改造:
|
||||
- 写 recall_events(ON CONFLICT DO NOTHING 按天去重)
|
||||
- 有 active 召回任务且 pay_time > created_at → 完成任务
|
||||
- 关闭旧回访 → 新建回访(48h)
|
||||
- 关闭旧回访 → 新建回访(72h)
|
||||
- 无 active 任务也生成回访
|
||||
|
||||
返回: {"completed": int, "events": int}
|
||||
@@ -323,9 +414,9 @@ def _process_pair(
|
||||
detail={"reason": "new_service_record", "service_time": str(latest_pay_time)},
|
||||
)
|
||||
|
||||
# ── 4. 创建新的回访任务(48h 过期) ──
|
||||
# ── 4. 创建新的回访任务(72h / 3天过期) ──
|
||||
expires_at = (
|
||||
latest_pay_time + timedelta(hours=48)
|
||||
latest_pay_time + timedelta(hours=72)
|
||||
if hasattr(latest_pay_time, '__add__') else None
|
||||
)
|
||||
cur.execute(
|
||||
|
||||
Reference in New Issue
Block a user