From d7e97978c6fa178557ec246a9309ca341e4c35d2 Mon Sep 17 00:00:00 2001 From: Hermes CI Fix Date: Tue, 11 Aug 2026 11:32:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=86=99=E6=8E=A5=E5=8F=A3entity=5Fid?= =?UTF-8?q?=20token=E4=BC=98=E5=85=88=EF=BC=88resolve=5Fentity=5Ffor=5Freq?= =?UTF-8?q?uest=EF=BC=89+=20=E7=99=BB=E5=BD=95=E9=A1=B5=E7=94=A8=E9=A1=B6?= =?UTF-8?q?=E5=B1=82entity=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/api/cash.py | 8 ++++---- backend/app/api/predict.py | 12 ++++++------ backend/app/api/tax_compliance.py | 15 +++++++++------ 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/backend/app/api/cash.py b/backend/app/api/cash.py index 18c7ad7e..d7cdcf30 100644 --- a/backend/app/api/cash.py +++ b/backend/app/api/cash.py @@ -1,10 +1,10 @@ """资金管理API — 资金缺口预测 + 收付款计划 + 预警 (资金管理智能体)""" import logging from datetime import datetime, timedelta -from fastapi import APIRouter, HTTPException, Depends, Query +from fastapi import APIRouter, HTTPException, Depends, Query, Request from sqlalchemy.orm import Session from app.database import get_db -from app.deps import get_entity_id +from app.deps import get_entity_id, resolve_entity_for_request from app.auth_middleware import require_role from app.models import CashPlan from app.utils.cash_forecast_engine import ( @@ -119,7 +119,7 @@ def api_list_plans( @router.post("/plans") -def api_create_plan(data: dict, db: Session = Depends(get_db)): +def api_create_plan(request: Request, data: dict, db: Session = Depends(get_db)): """新建收付款计划""" plan_type = data.get("plan_type") if plan_type not in ("receive", "pay"): @@ -136,7 +136,7 @@ def api_create_plan(data: dict, db: Session = Depends(get_db)): raise HTTPException(400, "plan_date格式应为YYYY-MM-DD") plan = CashPlan( - entity_id=int(data.get("entity_id", 1)), + entity_id=resolve_entity_for_request(request, int(data.get("entity_id", 1))), plan_type=plan_type, amount=amount, plan_date=plan_date, diff --git a/backend/app/api/predict.py b/backend/app/api/predict.py index 7b130b22..628f7a31 100644 --- a/backend/app/api/predict.py +++ b/backend/app/api/predict.py @@ -1,6 +1,6 @@ """预测模拟API — 管理会计OS""" import logging -from fastapi import APIRouter, HTTPException, Depends +from fastapi import APIRouter, HTTPException, Depends, Request from app.utils.predict_engine import ( cvp_analysis, npv, irr, sensitivity_analysis, scenario_analysis, @@ -10,7 +10,7 @@ from app.utils.cash_forecast_engine import ( calculate_accuracy, generate_scenario_suggestion, ) from app.database import get_db -from app.deps import get_entity_id +from app.deps import get_entity_id, resolve_entity_for_request from sqlalchemy.orm import Session logger = logging.getLogger("cma.predict") @@ -165,10 +165,10 @@ def api_cvp_detailed(data: dict): @router.post("/cash-forecast") -def api_cash_forecast(data: dict, db: Session = Depends(get_db)): +def api_cash_forecast(request: Request, data: dict, db: Session = Depends(get_db)): """现金流预测 — 根据历史KPI推算未来30天现金流""" try: - entity_id = int(data.get("entity_id", 1)) + entity_id = resolve_entity_for_request(request, int(data.get("entity_id", 1))) days = int(data.get("days", 30)) current_cash = float(data["current_cash"]) if data.get("current_cash") else None result = forecast_cash_flow(entity_id, db, days, current_cash) @@ -628,10 +628,10 @@ def _get_dim_detail_indicators(dimension: str, entity: dict) -> list: @router.post("/growth-quality") -def api_growth_quality(data: dict): +def api_growth_quality(request: Request, data: dict): """增长质量诊断 — 五维度评分+综合评分+诊断结论""" try: - entity_id = data.get("entity_id") + entity_id = resolve_entity_for_request(request, data.get("entity_id")) ENTITY_DATA = { 1: {"entity":"陕西酣客文化传媒","rebateRate":82.8,"trueGrossMargin":18.6,"cashRatio":0.6,"expenseGrowthRate":2.2,"revenueGrowthRate":1.0,"mgmtRatio":447}, 2: {"entity":"陕西博海网络科技","rebateRate":0,"trueGrossMargin":13.1,"cashRatio":6.7,"expenseGrowthRate":0.8,"revenueGrowthRate":1.0,"mgmtRatio":1.4}, diff --git a/backend/app/api/tax_compliance.py b/backend/app/api/tax_compliance.py index 94af03cf..06bee411 100644 --- a/backend/app/api/tax_compliance.py +++ b/backend/app/api/tax_compliance.py @@ -7,11 +7,11 @@ import json from datetime import datetime, date -from fastapi import APIRouter, Depends, HTTPException, Query +from fastapi import APIRouter, Depends, HTTPException, Query, Request from sqlalchemy.orm import Session from app.database import get_db -from app.deps import get_entity_id +from app.deps import get_entity_id, resolve_entity_for_request from app.auth_middleware import require_auth, require_role from app.models import TaxRecord, InvoiceCheck, SocialSecurity, ExpenseReimbursement @@ -159,6 +159,7 @@ def list_tax_records( @router.post("/records") def create_tax_record( + request: Request, data: dict, db: Session = Depends(get_db), _=Depends(require_role("ceo", "finance")), @@ -171,7 +172,7 @@ def create_tax_record( if tax_type not in TAX_TYPE_LABELS: raise HTTPException(400, f"无效税种: {tax_type}，可选 vat/income/surtax") t = TaxRecord( - entity_id=data.get("entity_id") or 1, + entity_id=resolve_entity_for_request(request, data.get("entity_id") or 1), period=period, tax_type=tax_type, tax_payable=data.get("tax_payable") or 0, @@ -382,6 +383,7 @@ def list_invoices( @router.post("/invoices") def create_invoice( + request: Request, data: dict, db: Session = Depends(get_db), _=Depends(require_role("ceo", "finance")), @@ -393,7 +395,7 @@ def create_invoice( if data.get("amount") is None: raise HTTPException(400, "缺少必要参数: amount") inv = InvoiceCheck( - entity_id=data.get("entity_id") or 1, + entity_id=resolve_entity_for_request(request, data.get("entity_id") or 1), invoice_no=str(invoice_no).strip(), amount=data.get("amount"), invoice_type=data.get("invoice_type") or "vat", @@ -577,6 +579,7 @@ def list_ss_records( @router.post("/ss") def create_ss_record( + request: Request, data: dict, db: Session = Depends(get_db), _=Depends(require_role("ceo", "finance")), @@ -586,9 +589,9 @@ def create_ss_record( period = data.get("period") if not employee or not period: raise HTTPException(400, "缺少必要参数: employee, period") - all_records = db.query(SocialSecurity).filter(SocialSecurity.entity_id == (data.get("entity_id") or 1)).all() + all_records = db.query(SocialSecurity).filter(SocialSecurity.entity_id == resolve_entity_for_request(request, data.get("entity_id") or 1)).all() s = SocialSecurity( - entity_id=data.get("entity_id") or 1, + entity_id=resolve_entity_for_request(request, data.get("entity_id") or 1), employee=employee, period=period, base_amount=data.get("base_amount") or 0,