root/Neo-ZQYY
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat: 2026-04-15~05-02 累积变更基线 — AI 重构 + Runtime Context + DWS 修复

Browse Source 
涵盖（每条对应已存的审计记录）：
- AI 模块拆分：apps/backend/app/ai/apps -> prompts/（8 个 APP + app2a 派生）
  audit: 2026-04-20__ai-module-complete.md
- admin-web AI 管理套件：AIDashboard / AIOperations / AIRunLogs / AITriggers / TriggerManager
  audit: 2026-04-21__admin-web-ai-management-suite.md
- App2 财务洞察 prompt v3 -> v5.1 + 小程序 AI 接入（chat / board-finance）
  audit: 2026-04-22__app2_prompt_v5_1_and_miniprogram_ai_insight.md
- App2 prewarm 全过滤器 + AI 触发器 cron reschedule
  audit: 2026-04-21__app2-finance-prewarm-all-filters.md
  migration: 20260420_ai_trigger_jobs_and_app2_prewarm.sql / 20260421_app2_prewarm_cron_reschedule.sql
- AppType 联合类型对齐 + adminAiAppTypes.test.ts
  audit: 2026-04-30__admin_web_ai_app_type_alignment.md
- DashScope tokens_used 提取修复
  audit: 2026-04-30__backend_dashscope_tokens_used_extraction.md
- App3 线索完整详情 prompt
  audit: 2026-05-01__backend_app3_full_detail_prompt.md
- Runtime Context 沙箱（5-1~5-2 主线）：
  - 后端 schema/service + admin_runtime_context / xcx_runtime_clock 两个 router
  - admin-web RuntimeContext.tsx + miniprogram runtime-clock.ts
  - migration: 20260501__runtime_context_sandbox.sql
  - tools/db/verify_admin_web_sandbox.py + verify_sandbox_end_to_end.py
  - database/changes: 7 份 sandbox_* 验证报告
- 飞球 DWS 修复：finance_area_daily 区域汇总 + task_engine 调整
  + RLS 视图业务日上界（migration 20260502 + scripts/ops/gen_rls_business_date_migration.py）

合规：
- .gitignore 启用 tmp/ 排除
- 不入仓：apps/etl/connectors/feiqiu/.env（API_TOKEN secret，本地修改保留）

待验证清单：
- docs/audit/changes/2026-05-04__cumulative_baseline_pending_verification.md
  每个主题的功能完整性 / 上线验证几乎都未收口，按优先级 P0~P3 逐一处理
This commit is contained in:
Neo
2026-05-04 02:30:19 +08:00
parent 2010034840
commit caf179a5da
130 changed files with 14543 additions and 2717 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
apps/backend/app/ai/data_fetchers/assistant_data.py
View File

@@ -58,10 +58,16 @@ def _fetch_assistant_info_sync(site_id: int, assistant_id: int) -> dict[str, Any
conn = get_etl_readonly_connection(site_id)
# RLS 隔离 + 语句超时（get_etl_readonly_connection 的 SET LOCAL 在 commit 后失效，
# 需在查询事务中重新设置）
# CHANGE 2026-05-02 | 同时下发 app.current_business_date，供 RLS 视图业务日上界裁剪
from app.services.runtime_context import as_runtime_today_param as _rt_today
_ref_date = _rt_today(site_id)
with conn.cursor() as cur:
cur.execute(
"SET LOCAL app.current_site_id = %s", (str(site_id),)
)
cur.execute(
"SET LOCAL app.current_business_date = %s", (_ref_date.isoformat(),)
)
cur.execute(
"SET LOCAL statement_timeout = %s",
(f"{FDW_QUERY_TIMEOUT_SEC * 1000}",),
@@ -86,11 +92,12 @@ def _fetch_assistant_info_sync(site_id: int, assistant_id: int) -> dict[str, Any
level = row[1] or ""
hire_date = row[2]
# 计算工龄
# 计算工龄（CHANGE 2026-05-02 | 用 business_date 替代 today，沙箱按当时工龄）
from app.services.runtime_context import as_runtime_today_param
ref_date = as_runtime_today_param(site_id)
tenure_months = 0
if hire_date and isinstance(hire_date, date):
today = date.today()
tenure_months = (today.year - hire_date.year) * 12 + (today.month - hire_date.month)
tenure_months = (ref_date.year - hire_date.year) * 12 + (ref_date.month - hire_date.month)
# 绩效数据
# ⚠️ 列名映射: monthly_customers 不存在（用 0 占位），performance_tier→tier_name
@@ -184,10 +191,16 @@ def _fetch_service_history_sync(
conn = get_etl_readonly_connection(site_id)
# RLS 隔离 + 语句超时（get_etl_readonly_connection 的 SET LOCAL 在 commit 后失效，
# 需在查询事务中重新设置）
# CHANGE 2026-05-02 | 同时下发 app.current_business_date，供 RLS 视图业务日上界裁剪
from app.services.runtime_context import as_runtime_today_param as _rt_today2
_ref_date_outer = _rt_today2(site_id)
with conn.cursor() as cur:
cur.execute(
"SET LOCAL app.current_site_id = %s", (str(site_id),)
)
cur.execute(
"SET LOCAL app.current_business_date = %s", (_ref_date_outer.isoformat(),)
)
cur.execute(
"SET LOCAL statement_timeout = %s",
(f"{FDW_QUERY_TIMEOUT_SEC * 1000}",),
@@ -197,6 +210,9 @@ def _fetch_service_history_sync(
# is_trash=false→is_delete=0, service_date→create_time,
# duration_minutes→real_use_seconds/60, items_sum→ledger_amount,
# room_name→site_table_id, is_pd→(order_assistant_type=1)
# CHANGE 2026-05-02 | 用 business_date 替代 CURRENT_DATE，沙箱不读「未来」服务记录
from app.services.runtime_context import as_runtime_today_param
ref_date = as_runtime_today_param(site_id)
cur.execute(
"""
SELECT
@@ -209,10 +225,11 @@ def _fetch_service_history_sync(
WHERE site_assistant_id = %s
AND tenant_member_id = %s
AND is_delete = 0
AND create_time >= (CURRENT_DATE - INTERVAL '%s months')
AND create_time >= (%s::date - (INTERVAL '1 month' * %s))
AND create_time < (%s::date + INTERVAL '1 day')
ORDER BY create_time DESC
""",
(assistant_id, member_id, months),
(assistant_id, member_id, ref_date, months, ref_date),
)
columns = [desc[0] for desc in cur.description]
rows = cur.fetchall()

39
apps/backend/app/ai/data_fetchers/member_data.py
View File

@@ -63,16 +63,27 @@ def _fetch_member_consumption_data_sync(
member_id: int,
months: int,
) -> dict[str, Any]:
"""同步实现：在单个 FDW 连接上串行执行多个查询。"""
"""同步实现：在单个 FDW 连接上串行执行多个查询。
CHANGE 2026-05-02 | 所有窗口查询都按业务日上界裁剪，
sandbox 模式下不再读取 sandbox_date 之后的真实消费 / 到店。
"""
from app.services.runtime_context import as_runtime_today_param
conn = None
try:
conn = get_etl_readonly_connection(site_id)
ref_date = as_runtime_today_param(site_id)
# RLS 隔离 + 语句超时（get_etl_readonly_connection 的 SET LOCAL 在 commit 后失效，
# 需在查询事务中重新设置）
# CHANGE 2026-05-02 | 同时下发 app.current_business_date，供 RLS 视图业务日上界裁剪
with conn.cursor() as cur:
cur.execute(
"SET LOCAL app.current_site_id = %s", (str(site_id),)
)
cur.execute(
"SET LOCAL app.current_business_date = %s", (ref_date.isoformat(),)
)
cur.execute(
"SET LOCAL statement_timeout = %s",
(f"{FDW_QUERY_TIMEOUT_SEC * 1000}",), # 毫秒
@@ -82,7 +93,7 @@ def _fetch_member_consumption_data_sync(
nickname = _query_member_nickname(conn, member_id)
# 2. 消费记录（台桌结账 + 商城订单）
records, total_count = _query_consumption_records(conn, member_id, months)
records, total_count = _query_consumption_records(conn, member_id, months, ref_date)
# 3. 会员卡明细
cards = _query_member_cards(conn, member_id)
@@ -91,7 +102,7 @@ def _fetch_member_consumption_data_sync(
balance_info = _query_balance_summary(conn, member_id)
# 5. 到店数据
visit_info = _query_visit_info(conn, member_id)
visit_info = _query_visit_info(conn, member_id, ref_date)
result: dict[str, Any] = {
"member_nickname": nickname,
@@ -145,7 +156,7 @@ def _query_member_nickname(conn: Any, member_id: int) -> str:
def _query_consumption_records(
conn: Any, member_id: int, months: int
conn: Any, member_id: int, months: int, ref_date: date
) -> tuple[list[dict], int]:
"""从 app.v_dwd_settlement_head + app.v_dwd_table_fee_log 获取消费记录。
@@ -153,6 +164,7 @@ def _query_consumption_records(
⚠️ 费用拆分字段（table_charge_money, assistant_pd/cx_money）在 settlement_head 上。
⚠️ table_fee_log 提供台桌时长（real_table_use_seconds）和桌台ID（site_table_id）。
⚠️ 列名映射: settle_date→create_time, settle_id→order_settle_id, sale_amount→ledger_amount。
CHANGE 2026-05-02 | 用 ref_date（业务日）替代 CURRENT_DATE，沙箱不读「未来」消费。
返回 (records, total_count)。
"""
with conn.cursor() as cur:
@@ -163,9 +175,10 @@ def _query_consumption_records(
FROM app.v_dwd_settlement_head sh
WHERE sh.member_id = %s
AND sh.settle_type IN (1, 3)
AND sh.create_time >= (CURRENT_DATE - INTERVAL '%s months')
AND sh.create_time >= (%s::date - (INTERVAL '1 month' * %s))
AND sh.create_time < (%s::date + INTERVAL '1 day')
""",
(member_id, months),
(member_id, ref_date, months, ref_date),
)
total_count = cur.fetchone()[0]
@@ -208,11 +221,12 @@ def _query_consumption_records(
) coaches ON true
WHERE sh.member_id = %s
AND sh.settle_type IN (1, 3)
AND sh.create_time >= (CURRENT_DATE - INTERVAL '%s months')
AND sh.create_time >= (%s::date - (INTERVAL '1 month' * %s))
AND sh.create_time < (%s::date + INTERVAL '1 day')
ORDER BY sh.create_time DESC
LIMIT %s
""",
(member_id, months, MAX_CONSUMPTION_RECORDS),
(member_id, ref_date, months, ref_date, MAX_CONSUMPTION_RECORDS),
)
columns = [desc[0] for desc in cur.description]
rows = cur.fetchall()
@@ -294,9 +308,10 @@ def _query_balance_summary(conn: Any, member_id: int) -> dict:
}
def _query_visit_info(conn: Any, member_id: int) -> dict:
def _query_visit_info(conn: Any, member_id: int, ref_date: date) -> dict:
"""从 app.v_dws_member_visit_detail 获取到店数据，推算预计到店日期。
⚠️ 列名映射: last_visit_date→MAX(visit_date), avg_visit_interval_days 需从明细计算。
CHANGE 2026-05-02 | 仅取 ref_date 及之前的到店明细，days_since 按 ref_date 计算。
"""
with conn.cursor() as cur:
# 获取最近到店日期和平均到店间隔
@@ -307,6 +322,7 @@ def _query_visit_info(conn: Any, member_id: int) -> dict:
LAG(visit_date) OVER (ORDER BY visit_date) AS prev_visit
FROM app.v_dws_member_visit_detail
WHERE member_id = %s
AND visit_date <= %s
)
SELECT
MAX(visit_date) AS last_visit_date,
@@ -314,7 +330,7 @@ def _query_visit_info(conn: Any, member_id: int) -> dict:
FROM visits
WHERE prev_visit IS NOT NULL
""",
(member_id,),
(member_id, ref_date),
)
row = cur.fetchone()
@@ -323,8 +339,7 @@ def _query_visit_info(conn: Any, member_id: int) -> dict:
last_visit = row[0]
avg_interval = row[1]
today = date.today()
days_since = (today - last_visit).days if isinstance(last_visit, date) else None
days_since = (ref_date - last_visit).days if isinstance(last_visit, date) else None
expected = None
if avg_interval and last_visit:

29
apps/backend/app/ai/data_fetchers/page_context.py
View File

@@ -352,7 +352,9 @@ def _text_board_finance(
"SET LOCAL statement_timeout = %s",
(f"{FDW_QUERY_TIMEOUT_SEC * 1000}",),
)
# 简化查询：获取汇总数据
# 简化查询：获取汇总数据（CHANGE 2026-05-02 | 用 business_date 替代 CURRENT_DATE）
from app.services.runtime_context import as_runtime_today_param
_ref_date = as_runtime_today_param(site_id)
cur.execute(
"""
SELECT
@@ -361,8 +363,10 @@ def _text_board_finance(
COALESCE(AVG(items_sum), 0) AS avg_revenue
FROM app.v_dwd_settlement_head
WHERE settle_type IN (1, 3)
AND settle_date >= (CURRENT_DATE - INTERVAL '1 month')
AND settle_date >= (%s::date - INTERVAL '1 month')
AND settle_date <= %s::date
""",
(_ref_date, _ref_date),
)
row = cur.fetchone()
etl_conn.commit()
@@ -399,7 +403,9 @@ def _text_board_customer(
"SET LOCAL statement_timeout = %s",
(f"{FDW_QUERY_TIMEOUT_SEC * 1000}",),
)
# Top 10 客户
# Top 10 客户（CHANGE 2026-05-02 | 用 business_date 替代 CURRENT_DATE）
from app.services.runtime_context import as_runtime_today_param
_ref_date = as_runtime_today_param(site_id)
cur.execute(
"""
SELECT
@@ -410,11 +416,13 @@ def _text_board_customer(
ON dm.member_id = sh.member_id AND dm.scd2_is_current = 1
WHERE sh.settle_type IN (1, 3)
AND sh.member_id > 0
AND sh.settle_date >= (CURRENT_DATE - INTERVAL '1 month')
AND sh.settle_date >= (%s::date - INTERVAL '1 month')
AND sh.settle_date <= %s::date
GROUP BY dm.nickname
ORDER BY total_consumption DESC
LIMIT 10
""",
(_ref_date, _ref_date),
)
rows = cur.fetchall()
etl_conn.commit()
@@ -452,6 +460,9 @@ def _text_board_coach(
"SET LOCAL statement_timeout = %s",
(f"{FDW_QUERY_TIMEOUT_SEC * 1000}",),
)
# CHANGE 2026-05-02 | 用 business_date 替代 CURRENT_DATE
from app.services.runtime_context import as_runtime_today_param
_ref_date = as_runtime_today_param(site_id)
cur.execute(
"""
SELECT
@@ -462,11 +473,13 @@ def _text_board_coach(
JOIN app.v_dim_assistant da
ON da.assistant_id = sl.site_assistant_id
WHERE sl.is_delete = 0
AND sl.create_time >= (CURRENT_DATE - INTERVAL '1 month')
AND sl.create_time >= (%s::date - INTERVAL '1 month')
AND sl.create_time < (%s::date + INTERVAL '1 day')
GROUP BY da.nickname
ORDER BY service_count DESC
LIMIT 10
""",
(_ref_date, _ref_date),
)
rows = cur.fetchall()
etl_conn.commit()
@@ -590,6 +603,9 @@ def _text_customer_service_records(
"SET LOCAL statement_timeout = %s",
(f"{FDW_QUERY_TIMEOUT_SEC * 1000}",),
)
# CHANGE 2026-05-02 | 仅取业务日及之前的服务记录，沙箱不读「未来」
from app.services.runtime_context import as_runtime_today_param
_ref_date = as_runtime_today_param(site_id)
cur.execute(
"""
SELECT
@@ -599,10 +615,11 @@ def _text_customer_service_records(
site_table_id
FROM app.v_dwd_assistant_service_log
WHERE tenant_member_id = %s AND is_delete = 0
AND create_time < (%s::date + INTERVAL '1 day')
ORDER BY create_time DESC
LIMIT 10
""",
(member_id,),
(member_id, _ref_date),
)
rows = cur.fetchall()
etl_conn.commit()