b50495bebe
短信(SMS_MOCK 切 mock/real): - integrations/sms.py 重写: real 模式走极光短信 REST /v1/messages 自定义验证码(本服务 secrets 生成 6 位码 + 进程内存 + 本地校验一次性/防爆破), 鉴权复用极光一键登录 JG_APP_KEY/MASTER_SECRET (同一极光应用, 上线只需 SMS_MOCK=false); mock 仍"任意6位通过"不动其余测试 - 防刷四层: 单号冷却 + 单号每日上限 + 单IP rate_limit(/sms/send 10/min、/sms/login 20/min) + 单码失败次数作废; SmsError 带 status_code 映射 429/503/400 - config 增 SMS_SEND_ENDPOINT/SIGN_ID/TEMPLATE_ID/CODE_LENGTH/DAILY_LIMIT/MAX_VERIFY_ATTEMPTS; test_auth 加 real 模式单测; sms.md/后端技术实现/待办账本同步 admin 后台(app/admin/ 独立子应用, uvicorn app.admin.main:admin_app :8771): - 复用主仓 models/repositories/integrations + 同库, 鉴权完全隔离(ADMIN_JWT_SECRET≠JWT_SECRET_KEY + payload typ=admin + bcrypt 密码 + 可选 IP 白名单); 主 app 不 import 本包, admin 崩不影响主进程 - 路由: 登录 / 账号管理(RBAC: super_admin·finance·operator) / 用户列表+360详情+封禁+手动调币 / 钱包流水 / 提现重试对账 / 反馈工单 / 数据大盘; 全写操作落 admin_audit_log(涉钱与业务写同事务) - 涉钱逻辑(调微信/退款/对账)复用 app.repositories.wallet 不重写 - 新增 models/admin.py(AdminUser/AdminAuditLog) + admin_tables 迁移 + create_admin.py + deploy/shaguabijia-admin.service; 依赖加 bcrypt Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
86 lines
3.5 KiB
Python
86 lines
3.5 KiB
Python
"""admin 提现:列表(读)+ 单笔重试查单 + 批量对账(写,带审计)。
|
|
|
|
提现的钱逻辑(查微信/退款/撤单/幂等)全部复用 app.repositories.wallet,admin 只触发 + 记审计。
|
|
这些 wallet 函数内部各自 commit(涉及微信调用),审计在其后单独 commit:操作本身幂等,
|
|
审计记录"谁触发的 + 结果",事务边界比"改金币"宽松是有意的(不能塞进 wallet 的自有事务)。
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
from typing import Annotated
|
|
|
|
from fastapi import APIRouter, Depends, HTTPException, Query, Request
|
|
|
|
from app.admin.audit import write_audit
|
|
from app.admin.deps import AdminDb, get_client_ip, get_current_admin, require_role
|
|
from app.admin.repositories import queries
|
|
from app.admin.schemas.common import CursorPage
|
|
from app.admin.schemas.wallet import ReconcileResult, WithdrawOrderOut
|
|
from app.integrations import wxpay
|
|
from app.models.admin import AdminUser
|
|
from app.repositories import wallet as wallet_repo
|
|
|
|
router = APIRouter(
|
|
prefix="/admin/api/withdraws",
|
|
tags=["admin-withdraw"],
|
|
dependencies=[Depends(get_current_admin)],
|
|
)
|
|
|
|
|
|
@router.get("", response_model=CursorPage[WithdrawOrderOut], summary="提现单列表")
|
|
def list_withdraws(
|
|
db: AdminDb,
|
|
user_id: Annotated[int | None, Query()] = None,
|
|
status: Annotated[str | None, Query()] = None,
|
|
limit: Annotated[int, Query(ge=1, le=100)] = 20,
|
|
cursor: Annotated[int | None, Query()] = None,
|
|
) -> CursorPage[WithdrawOrderOut]:
|
|
items, next_cursor = queries.list_all_withdraw_orders(
|
|
db, user_id=user_id, status=status, limit=limit, cursor=cursor,
|
|
)
|
|
return CursorPage(
|
|
items=[WithdrawOrderOut.model_validate(o) for o in items], next_cursor=next_cursor,
|
|
)
|
|
|
|
|
|
# 注意:/reconcile 必须在 /{out_bill_no}/refresh 之前声明(静态路径优先于路径参数)
|
|
@router.post("/reconcile", response_model=ReconcileResult, summary="批量对账(扫超时 pending 单)")
|
|
def reconcile(
|
|
request: Request,
|
|
admin: Annotated[AdminUser, Depends(require_role("finance"))],
|
|
db: AdminDb,
|
|
older_than_minutes: Annotated[int, Query(ge=0)] = 15,
|
|
) -> ReconcileResult:
|
|
try:
|
|
result = wallet_repo.reconcile_pending_withdraws(db, older_than_minutes=older_than_minutes)
|
|
except wxpay.WxPayNotConfiguredError as e:
|
|
raise HTTPException(status_code=503, detail="微信支付未配置") from e
|
|
write_audit(
|
|
db, admin, action="withdraw.reconcile", target_type="withdraw", target_id=None,
|
|
detail=result, ip=get_client_ip(request), commit=True,
|
|
)
|
|
return ReconcileResult(**result)
|
|
|
|
|
|
@router.post("/{out_bill_no}/refresh", response_model=WithdrawOrderOut, summary="单笔重试查单")
|
|
def refresh_withdraw(
|
|
out_bill_no: str,
|
|
request: Request,
|
|
admin: Annotated[AdminUser, Depends(require_role("finance"))],
|
|
db: AdminDb,
|
|
) -> WithdrawOrderOut:
|
|
order = queries.get_withdraw_by_out_bill_no(db, out_bill_no)
|
|
if order is None:
|
|
raise HTTPException(status_code=404, detail="提现单不存在")
|
|
try:
|
|
refreshed = wallet_repo.refresh_withdraw_status(
|
|
db, order.user_id, out_bill_no, cancel_if_unconfirmed=True,
|
|
)
|
|
except wxpay.WxPayNotConfiguredError as e:
|
|
raise HTTPException(status_code=503, detail="微信支付未配置") from e
|
|
write_audit(
|
|
db, admin, action="withdraw.refresh", target_type="withdraw", target_id=out_bill_no,
|
|
detail={"status": refreshed.status, "wechat_state": refreshed.wechat_state},
|
|
ip=get_client_ip(request), commit=True,
|
|
)
|
|
return WithdrawOrderOut.model_validate(refreshed)
|