feat: 业务层 services 抽取(财务/结算/补贴)

- FinanceService:opc_add_finance 直写 ORM 改为走 Repository.create(修复四层依赖违规)
- SettlementService:结算佣金(5%)/电子合同幂等/争议联动/投资撮合评分
- SubsidyService:政务三级审批状态机(区县→市→省→发放)
- rbac_ecosystem/rbac_government/rbac_opc 接线,路由瘦身
This commit is contained in:
2026-08-24 01:54:04 +08:00
parent 557ec90229
commit 413bd29390
7 changed files with 183 additions and 78 deletions
+17 -45
View File
@@ -91,13 +91,9 @@ async def sign_contract(
db: Database = Depends(get_db),
actor: dict = Depends(require_roles("enterprise", "opc_member")),
):
task = await db.tasks.get(task_id)
if task is None:
raise HTTPException(status_code=404, detail="Task not found")
if await db.contracts.get_for_task(task_id) is not None:
return await db.contracts.get_for_task(task_id)
opc_id = req.opc_id or (actor["id"] if actor.get("role") == "opc_member" else "")
contract = await db.contracts.create(task_id, task["title"], actor["id"], opc_id)
from ...services.settlement_service import SettlementService
contract = await SettlementService(db).sign_contract(task_id, actor, req.opc_id)
await write_audit(db, action="contract.sign", resource="contract", resource_id=contract["id"],
user=actor, request=request)
return contract
@@ -111,18 +107,11 @@ async def release_escrow(
db: Database = Depends(get_db),
actor: dict = Depends(require_roles("enterprise")),
):
task = await db.tasks.get(task_id)
if task is None or task["status"] != "completed":
raise HTTPException(status_code=400, detail="任务未完成,不能结算")
escrow = await db.escrows.list()
esc = next((e for e in escrow if e["task_id"] == task_id), None)
if esc is None:
amount = max(task.get("budget_min", 0), task.get("budget_max", 0))
commission = int(amount * 0.05)
esc = await db.escrows.create(task_id, task["title"], amount, commission)
released = await db.escrows.set_status(esc["id"], "released")
await write_audit(db, action="escrow.release", resource="escrow", resource_id=esc["id"],
detail=f"amount={esc['amount']}", user=actor, request=request)
from ...services.settlement_service import SettlementService
released = await SettlementService(db).release_escrow(task_id)
await write_audit(db, action="escrow.release", resource="escrow", resource_id=released["id"],
detail=f"amount={released['amount']}", user=actor, request=request)
return released
@@ -148,11 +137,9 @@ async def create_dispute(
db: Database = Depends(get_db),
actor: dict = Depends(require_roles("enterprise", "opc_member")),
):
task = await db.tasks.get(task_id)
if task is None:
raise HTTPException(status_code=404, detail="Task not found")
dispute = await db.disputes.create(task_id, task["title"], actor["id"], req.reason)
await db.tasks.set_status(task_id, "disputed")
from ...services.settlement_service import SettlementService
dispute = await SettlementService(db).create_dispute(task_id, actor, req.reason)
await write_audit(db, action="dispute.open", resource="dispute", resource_id=dispute["id"],
user=actor, request=request)
return dispute
@@ -165,9 +152,9 @@ async def resolve_dispute(
db: Database = Depends(get_db),
actor: dict = Depends(require_roles("operator")),
):
dispute = await db.disputes.set_status(dispute_id, "resolved", resolution="平台调解结案")
if dispute is None:
raise HTTPException(status_code=404, detail="Dispute not found")
from ...services.settlement_service import SettlementService
dispute = await SettlementService(db).resolve_dispute(dispute_id)
await write_audit(db, action="dispute.resolve", resource="dispute", resource_id=dispute_id,
user=actor, request=request)
return dispute
@@ -179,24 +166,9 @@ async def investor_matches(
db: Database = Depends(get_db),
user: dict = Depends(require_roles("investor")),
):
pref = await db.investor_prefs.get(user["id"]) or {}
industries = set(pref.get("industries") or [])
data = await db.portal_pages.get("investor", "projects") or {"items": []}
items = data.get("items", [])
scored = []
for it in items:
text = f"{it.get('title', '')} {it.get('meta', '')}"
score = 0
for ind in industries:
if ind and ind in text:
score += 10
stage = pref.get("stage")
if stage and stage in text:
score += 5
scored.append((score, it))
scored.sort(key=lambda x: x[0], reverse=True)
return {"items": [{"title": it["title"], "meta": it["meta"], "tag": it.get("tag"),
"match": min(100, s + 50)} for s, it in scored]}
from ...services.settlement_service import SettlementService
return await SettlementService(db).investor_matches(user["id"])
# ── 路演参与(进入直播/出席)────────────────────────────────────────────────
+7 -24
View File
@@ -111,14 +111,6 @@ async def gov_data(
# ── 补贴三级审批(区县→市→省→发放)─────────────────────────────────────────
# 各政务级别可推进的状态映射
_SUBSIDY_NEXT: dict[str, dict[str, str]] = {
"gov_district": {"applying": "district_review"},
"gov_city": {"district_review": "city_review"},
"gov_province": {"city_review": "province_review", "province_review": "approved"},
}
@router.get("/subsidies", summary="范围内补贴申报列表")
async def gov_subsidies(
db: Database = Depends(get_db),
@@ -134,17 +126,11 @@ async def gov_approve_subsidy(
db: Database = Depends(get_db),
user: dict = Depends(require_permission("menu:gov_data")),
):
sub = await db.subsidies.get(aid)
if sub is None:
raise HTTPException(status_code=404, detail="Subsidy not found")
if sub.get("region_id") and sub["region_id"] not in user.get("scope_region_ids", []):
raise HTTPException(status_code=403, detail="Forbidden: out of data scope")
nxt = (_SUBSIDY_NEXT.get(user.get("sub_role") or "") or {}).get(sub["status"])
if not nxt:
raise HTTPException(status_code=400, detail="当前级别不能审批该状态")
updated = await db.subsidies.set_status(aid, nxt)
from ...services.subsidy_service import SubsidyService
updated = await SubsidyService(db).approve(aid, user)
await write_audit(db, action="subsidy.approve", resource="subsidy", resource_id=aid,
detail=nxt, user=user, request=request)
detail=updated.get("status"), user=user, request=request)
return updated
@@ -155,12 +141,9 @@ async def gov_pay_subsidy(
db: Database = Depends(get_db),
user: dict = Depends(require_permission("menu:gov_data")),
):
sub = await db.subsidies.get(aid)
if sub is None:
raise HTTPException(status_code=404, detail="Subsidy not found")
if sub["status"] != "approved":
raise HTTPException(status_code=400, detail="仅已终审的补贴可发放")
updated = await db.subsidies.set_status(aid, "paid")
from ...services.subsidy_service import SubsidyService
updated = await SubsidyService(db).pay(aid)
await write_audit(db, action="subsidy.pay", resource="subsidy", resource_id=aid,
user=user, request=request)
return updated
+7 -9
View File
@@ -249,17 +249,15 @@ async def opc_add_finance(
db: Database = Depends(get_db),
actor: dict = Depends(require_roles("opc_member")),
):
record = FinanceRecord(
id=new_id("fin"), user_id=actor["id"], category=req.category,
amount=req.amount, date=req.date or utcnow_iso()[:10], note=req.note,
created_at=utcnow_iso(),
from ...services.finance_service import FinanceService
record = await FinanceService(db).add_record(
user_id=actor["id"], category=req.category, amount=req.amount,
date=req.date or utcnow_iso()[:10], note=req.note,
)
await db.session.add(record)
await db.session.commit()
await write_audit(db, action="finance.add", resource="finance", resource_id=record.id,
await write_audit(db, action="finance.add", resource="finance", resource_id=record["id"],
user=actor, request=request)
return {"id": record.id, "category": record.category, "amount": record.amount,
"date": record.date, "note": record.note}
return record
@router.get("/tax", summary="OPC 税务申报")