diff --git a/apps/backend/app/services/coach_service.py b/apps/backend/app/services/coach_service.py index bb5d712..4da4500 100644 --- a/apps/backend/app/services/coach_service.py +++ b/apps/backend/app/services/coach_service.py @@ -589,9 +589,11 @@ def _build_task_groups( if task_ids: try: with conn.cursor() as cur: + # 2026-05-05: biz.notes 无 is_pinned 列(SQL 报 UndefinedColumn 触发事务终止 + 级联失败), + # 删除该列,pinned 降级 False(置顶功能未落库,不影响核心备注展示) cur.execute( """ - SELECT task_id, is_pinned, content, created_at + SELECT task_id, content, created_at FROM biz.notes WHERE task_id = ANY(%s) ORDER BY created_at DESC @@ -603,9 +605,9 @@ def _build_task_groups( if tid not in task_notes_map: task_notes_map[tid] = [] task_notes_map[tid].append({ - "pinned": bool(nr[1]), - "text": nr[2] or "", - "date": nr[3].isoformat() if nr[3] else "", + "pinned": False, + "text": nr[1] or "", + "date": nr[2].isoformat() if nr[2] else "", }) except Exception: logger.warning("批量查询任务备注失败", exc_info=True) diff --git a/apps/backend/app/services/customer_service.py b/apps/backend/app/services/customer_service.py index 4d3da71..d3e2238 100644 --- a/apps/backend/app/services/customer_service.py +++ b/apps/backend/app/services/customer_service.py @@ -1085,15 +1085,16 @@ def _get_consumption_month_summary( consume_total = float(row[1]) if row[1] else 0.0 # 充值总额(从 settlement_head 的 recharge_card_amount) + # 2026-05-05: 修字段名,view v_dwd_settlement_head 列名为 member_id / create_time + # (不是 tenant_member_id / settle_time);已撤销订单 view 已过滤,无需 is_delete 条件 cur.execute( """ SELECT COALESCE(SUM(sh.recharge_card_amount), 0) FROM app.v_dwd_settlement_head sh - WHERE sh.tenant_member_id = %s - AND sh.is_delete = 0 + WHERE sh.member_id = %s AND sh.recharge_card_amount > 0 - AND sh.settle_time >= %s::timestamptz - AND sh.settle_time < %s::timestamptz + AND sh.create_time >= %s::timestamptz + AND sh.create_time < %s::timestamptz """, (customer_id, start_date, end_date), )