feat(wx): 微信服务号消息接收回调 /wx/mp/callback（截图比价入口第一步）

- GET 接入验证（校验 signature → 原样返回 echostr），供公众平台配置服务器 URL
- POST 收消息（安全模式：msg_signature 验签 + AES-256-CBC 解密），图片消息用 PicUrl 落盘
- config 加 WX_MP_TOKEN / WX_MP_AES_KEY + wx_mp_callback_configured
- 识别平台订单/pending标记/openid↔device 绑定留后续

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

.env.example

@@ -32,6 +32,13 @@ HEARTBEAT_MONITOR_ENABLED=true
 HEARTBEAT_TIMEOUT_MINUTES=60
 HEARTBEAT_SCAN_INTERVAL_SEC=60
 
+# ===== OPPO 推送(厂商通道直连,提现审核通过等交易类通知)=====
+# OPPO 开放平台注册应用后分配, 服务端鉴权用 AppKey + MasterSecret(≠极光 JG_*)。
+# 缺任一 → oppo_push_configured=False, 推送静默跳过(不影响审核/打款)。
+OPPO_PUSH_APP_KEY=
+OPPO_PUSH_MASTER_SECRET=
+# 可选(一般不改): OPPO_PUSH_ENABLED=true / OPPO_PUSH_REQUEST_TIMEOUT_SEC=10
+
 # ===== 短信 (mock 模式) =====
 # mock = true 时,任意 6 位数字均通过,且 /sms/send 不真发短信(只 log)。
 # 后续接阿里云/腾讯云短信时,改成 false 并填供应商相关 key。

alembic/versions/device_oppo_register_id.py

@@ -0,0 +1,34 @@
+"""device_liveness 加 oppo_register_id 列(OPPO 直连推送目标)
+
+提现审核通过等交易类通知走 OPPO 官方推送直连(≠极光)。客户端集成 OPPO SDK 后拿到 OPPO
+registerID, 经 device/register + heartbeat 上报, 存本列; 与极光 registration_id 并列,
+一台 OPPO 设备两套 token 并存。
+
+Revision ID: device_oppo_register_id
+Revises: comparison_llm_cost
+Create Date: 2026-07-15 00:00:00.000000
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'device_oppo_register_id'
+down_revision: Union[str, Sequence[str], None] = 'comparison_llm_cost'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    with op.batch_alter_table('device_liveness', schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column('oppo_register_id', sa.String(length=128), nullable=True)
+        )
+
+
+def downgrade() -> None:
+    with op.batch_alter_table('device_liveness', schema=None) as batch_op:
+        batch_op.drop_column('oppo_register_id')

alembic/versions/phone_rebind_log.py

@@ -1,32 +0,0 @@
-"""phone_rebind_log 表(M2 换绑 30 天限制台账)
-
-Revision ID: phone_rebind_log
-Revises: comparison_llm_cost
-"""
-from alembic import op
-import sqlalchemy as sa
-
-revision = "phone_rebind_log"
-down_revision = "comparison_llm_cost"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    op.create_table(
-        "phone_rebind_log",
-        sa.Column("id", sa.Integer(), primary_key=True, autoincrement=True),
-        sa.Column("phone", sa.String(length=20), nullable=False),
-        sa.Column("old_user_id", sa.Integer(), nullable=True),
-        sa.Column("new_user_id", sa.Integer(), nullable=False),
-        sa.Column("source", sa.String(length=32), nullable=False, server_default="wechat_conflict"),
-        sa.Column("rebound_at", sa.DateTime(timezone=True), server_default=sa.func.now(), nullable=False),
-    )
-    op.create_index("ix_phone_rebind_log_phone", "phone_rebind_log", ["phone"])
-    op.create_index("ix_phone_rebind_log_rebound_at", "phone_rebind_log", ["rebound_at"])
-
-
-def downgrade() -> None:
-    op.drop_index("ix_phone_rebind_log_rebound_at", table_name="phone_rebind_log")
-    op.drop_index("ix_phone_rebind_log_phone", table_name="phone_rebind_log")
-    op.drop_table("phone_rebind_log")

app/admin/routers/withdraw.py

@@ -37,6 +37,7 @@ from app.integrations import wxpay
 from app.models.admin import AdminUser
 from app.repositories import app_config
 from app.repositories import wallet as wallet_repo
+from app.services import push_notify
 
 router = APIRouter(
     prefix="/admin/api/withdraws",
@@ -315,6 +316,9 @@ def bulk_approve_withdraws(
             results.append(
                 WithdrawBulkItemResult(out_bill_no=out_bill_no, ok=True, status=order.status)
             )
+            # 审核通过 → OPPO 推送(fire-and-forget, 不阻塞批量审核; status=failed 已退款, 不推)
+            if order.status != "failed":
+                push_notify.notify_withdraw_approved_async(order.user_id)
         except wallet_repo.WithdrawOrderNotFound:
             db.rollback()
             results.append(
@@ -438,6 +442,9 @@ def approve_withdraw_order(
         },
         ip=get_client_ip(request), commit=True,
     )
+    # 审核通过 → OPPO 推送(fire-and-forget, 不阻塞审核响应; status=failed 是打款失败已退款, 不推)
+    if order.status != "failed":
+        push_notify.notify_withdraw_approved_async(order.user_id)
     return WithdrawOrderOut.model_validate(order)
 
 

app/api/v1/auth.py

@@ -12,36 +12,19 @@ from __future__ import annotations
 
 import logging
 
-from fastapi import APIRouter, HTTPException, Request
-from sqlalchemy.exc import IntegrityError
+from fastapi import APIRouter, HTTPException, Request, status
 
 from app.api.deps import CurrentUser, DbSession
 from app.core import test_account
-from app.core.ratelimit import (
-    RateLimitRule,
-    check_rate_limits,
-    enforce_rate_limit,
-    record_rate_limits,
-)
-from app.core.security import (
-    TokenError,
-    create_bind_ticket,
-    create_conflict_ticket,
-    decode_bind_ticket,
-    decode_conflict_ticket,
-    decode_token,
-    issue_token_pair,
-)
-from app.integrations import wxpay
+from app.core.ratelimit import enforce_rate_limit
+from app.core.security import TokenError, decode_token, issue_token_pair
 from app.integrations.jiguang import JiguangError, mask_phone, verify_and_get_phone
 from app.integrations.sms import SmsError, send_code, verify_code
 from app.repositories import onboarding as onboarding_repo
-from app.repositories import phone_rebind as rebind_repo
 from app.repositories import user as user_repo
 from app.schemas.auth import (
     JverifyLoginRequest,
     LogoutResponse,
-    OccupiedAccountInfo,
     RefreshRequest,
     SmsLoginRequest,
     SmsSendRequest,
@@ -49,13 +32,6 @@ from app.schemas.auth import (
     TokenPair,
     TokenWithUser,
     UserOut,
-    WechatBindPhoneJverifyRequest,
-    WechatBindPhoneSmsRequest,
-    WechatBindResultResponse,
-    WechatConflictContinueRequest,
-    WechatConflictRebindRequest,
-    WechatLoginRequest,
-    WechatLoginResponse,
 )
 
 logger = logging.getLogger("shagua.auth")
@@ -64,10 +40,9 @@ router = APIRouter(prefix="/api/v1/auth", tags=["auth"])
 
 # 手机号登录防刷:同一设备(device_id) + 同一 IP 每小时最多的登录尝试次数(成功/失败都计)。
 SMS_LOGIN_MAX_PER_HOUR = 5
-# 发码防刷(同一设备 device_id + 同一 IP,**只按成功发码计数**;被单号 60s 冷却挡下的重发不占额度):
+# 发码防刷:同一设备(device_id) + 同一 IP 每小时最多的发码次数。
 # 堵「换手机号绕开单号 60s 冷却」的洞 —— 冷却是单号维度,一机换号能绕开。
-SMS_SEND_MAX_PER_HOUR_PER_DEVICE = 5     # 每小时上限
-SMS_SEND_MAX_PER_DAY_PER_DEVICE = 20     # 每天上限(再叠一层日封顶,挡低频长时间轰炸)
+SMS_SEND_MAX_PER_HOUR_PER_DEVICE = 5
 
 
 def _login_response(
@@ -124,26 +99,23 @@ def sms_send(req: SmsSendRequest, request: Request) -> SmsSendResponse:
         logger.info("test_account sms_send short-circuit (不真发)")
         return SmsSendResponse(sent=True, mock=True, cooldown_sec=0)
 
-    # 发码防刷:同一设备(device_id) + 同一 IP,每小时 / 每天两道闸,**均只按成功发码计数**。
-    # 补「换手机号绕开单号 60s 冷却」的洞(冷却是单号维度,一机换号能绕);设备维度按机器封顶,挡短信轰炸/烧钱。
-    # 关键:被单号 60s 冷却挡下的重发是「没真发、没烧钱」→ 不该占额度。故 check(先判)放在真发之前
-    # (超限直接 429、不真发),record(计数)只在 send_code 成功后调 —— 冷却/供应商失败抛 429 时直接返回、不计数。
-    send_rules = [
-        RateLimitRule("sms-send-device", SMS_SEND_MAX_PER_HOUR_PER_DEVICE, 3600,
-                      "操作过于频繁,请稍后再试"),
-        RateLimitRule("sms-send-device-daily", SMS_SEND_MAX_PER_DAY_PER_DEVICE, 86400,
-                      "今日验证码发送次数过多,请明天再试"),
-    ]
-    check_rate_limits(request, subject=req.device_id, rules=send_rules)
+    # 防刷:同一设备(device_id) + 同一 IP 每小时最多 SMS_SEND_MAX_PER_HOUR_PER_DEVICE 次发码。
+    # 补「换手机号绕开单号 60s 冷却」的洞(冷却是单号维度,一机换号能绕);设备维度按机器封顶,
+    # 挡短信轰炸/烧钱。放在真发(send_code)之前 → 超限直接拦下、不真发短信。
+    enforce_rate_limit(
+        request,
+        scope="sms-send-device",
+        subject=req.device_id,
+        limit=SMS_SEND_MAX_PER_HOUR_PER_DEVICE,
+        window_sec=3600,
+        detail="操作过于频繁,请稍后再试",
+    )
 
     try:
         cooldown = send_code(req.phone)
     except SmsError as e:
         raise HTTPException(status_code=e.status_code, detail=str(e)) from e
 
-    # 发码成功 → 两道闸各 +1(被单号冷却挡下的重发走不到这里,故不占额度)
-    record_rate_limits(request, subject=req.device_id, rules=send_rules)
-
     from app.core.config import settings  # 局部 import 避免循环
 
     return SmsSendResponse(sent=True, mock=settings.SMS_MOCK, cooldown_sec=cooldown)
@@ -194,261 +166,6 @@ def sms_login(req: SmsLoginRequest, request: Request, db: DbSession) -> TokenWit
     return _login_response(user, onboarding_completed=completed)
 
 
-# ===================== 微信登录 =====================
-
-@router.post(
-    "/wechat-login",
-    response_model=WechatLoginResponse,
-    summary="微信登录(openid 命中即登入,否则发绑号令牌)",
-)
-def wechat_login(req: WechatLoginRequest, db: DbSession) -> WechatLoginResponse:
-    from app.core.config import settings  # 局部 import,避免循环
-
-    # 微信登录只需 code→openid(sns/oauth2),不需要商户转账证书;故只校验 APP_ID/SECRET。
-    if not (settings.WECHAT_APP_ID and settings.WECHAT_APP_SECRET):
-        raise HTTPException(status_code=503, detail="wechat login not configured")
-
-    try:
-        info = wxpay.code_to_userinfo(req.code)  # {openid, nickname, avatar_url, raw};失败抛 ValueError
-    except ValueError as e:
-        raise HTTPException(status_code=400, detail=str(e)) from e
-
-    openid = info["openid"]
-    user = user_repo.get_user_by_wechat_openid(db, openid)
-    if user is not None:
-        # openid 命中 → 直接登入(绝不套用提现 bind-wechat 的"撞号即 409"逻辑)
-        if user.status != "active":
-            raise HTTPException(status_code=403, detail="account disabled")
-        user_repo.touch_last_login(db, user)
-        completed = onboarding_repo.is_completed(db, user_id=user.id, device_id=req.device_id)
-        logger.info("wechat_login hit user_id=%d openid=%s*** onboarded=%s", user.id, openid[:6], completed)
-        return WechatLoginResponse(
-            status="logged_in",
-            token=_login_response(user, onboarding_completed=completed),
-        )
-
-    # 未命中 → 签发短时 bind_ticket,进手机号绑定流程(账号此刻还不建)
-    ticket = create_bind_ticket(
-        openid=openid,
-        wechat_nickname=info["nickname"],
-        wechat_avatar_url=info["avatar_url"],
-    )
-    logger.info("wechat_login new openid=%s*** issue bind_ticket", openid[:6])
-    return WechatLoginResponse(
-        status="need_bind_phone",
-        bind_ticket=ticket,
-        wechat_nickname=info["nickname"],
-        wechat_avatar_url=info["avatar_url"],
-    )
-
-
-def _finish_wechat_bind(
-    db,
-    *,
-    openid: str,
-    wechat_nickname: str | None,
-    wechat_avatar_url: str | None,
-    phone: str,
-    device_id: str,
-) -> WechatBindResultResponse:
-    """绑手机建号的公共尾段:手机号被占用 → 返回 phone_occupied(M2 处理 3 选 1);
-    未占用 → 新建微信账号(channel=wechat,昵称头像取微信)→ 签 token 登入。"""
-    existing = user_repo.get_user_by_phone(db, phone)
-    if existing is not None:
-        from app.core.config import settings  # 局部 import,避免循环
-
-        ticket = create_conflict_ticket(
-            openid=openid,
-            wechat_nickname=wechat_nickname,
-            wechat_avatar_url=wechat_avatar_url,
-            phone=phone,
-        )
-        blocked = rebind_repo.rebound_within_days(db, phone, settings.PHONE_REBIND_LIMIT_DAYS)
-        logger.info(
-            "wechat bind phone occupied phone=%s by user_id=%d has_wechat=%s",
-            mask_phone(phone), existing.id, bool(existing.wechat_openid),
-        )
-        return WechatBindResultResponse(
-            status="phone_occupied",
-            occupied_account=OccupiedAccountInfo(
-                nickname=existing.nickname,
-                avatar_url=existing.avatar_url,
-                created_at=existing.created_at,
-                has_wechat=bool(existing.wechat_openid),
-            ),
-            conflict_ticket=ticket,
-            rebind_available=not blocked,
-            rebind_blocked_days=(
-                rebind_repo.remaining_block_days(db, phone, settings.PHONE_REBIND_LIMIT_DAYS)
-                if blocked else 0
-            ),
-        )
-    user = user_repo.create_wechat_user(
-        db,
-        phone=phone,
-        openid=openid,
-        wechat_nickname=wechat_nickname,
-        wechat_avatar_url=wechat_avatar_url,
-    )
-    completed = onboarding_repo.is_completed(db, user_id=user.id, device_id=device_id)
-    logger.info("wechat bind ok user_id=%d phone=%s openid=%s*** onboarded=%s",
-                user.id, mask_phone(phone), openid[:6], completed)
-    return WechatBindResultResponse(
-        status="logged_in",
-        token=_login_response(user, onboarding_completed=completed),
-    )
-
-
-@router.post(
-    "/wechat/bind-phone/sms",
-    response_model=WechatBindResultResponse,
-    summary="微信登录·其他手机号(短信)绑定",
-)
-def wechat_bind_phone_sms(
-    req: WechatBindPhoneSmsRequest, request: Request, db: DbSession
-) -> WechatBindResultResponse:
-    try:
-        claims = decode_bind_ticket(req.bind_ticket)
-    except TokenError as e:
-        raise HTTPException(status_code=401, detail="授权已过期,请重新用微信登录") from e
-
-    # 防刷:同 sms/login,按 设备+IP 每小时限流(放在验证码校验之前,失败也计数)
-    enforce_rate_limit(
-        request,
-        scope="wechat-bind-sms-device",
-        subject=req.device_id,
-        limit=SMS_LOGIN_MAX_PER_HOUR,
-        window_sec=3600,
-        detail="登录尝试过于频繁,请稍后再试",
-    )
-
-    if not verify_code(req.phone, req.code):
-        raise HTTPException(status_code=400, detail="invalid sms code")
-
-    return _finish_wechat_bind(
-        db,
-        openid=claims["openid"],
-        wechat_nickname=claims["wnk"],
-        wechat_avatar_url=claims["wav"],
-        phone=req.phone,
-        device_id=req.device_id,
-    )
-
-
-@router.post(
-    "/wechat/bind-phone/jverify",
-    response_model=WechatBindResultResponse,
-    summary="微信登录·本机号(极光)绑定",
-)
-def wechat_bind_phone_jverify(
-    req: WechatBindPhoneJverifyRequest, db: DbSession
-) -> WechatBindResultResponse:
-    try:
-        claims = decode_bind_ticket(req.bind_ticket)
-    except TokenError as e:
-        raise HTTPException(status_code=401, detail="授权已过期,请重新用微信登录") from e
-
-    try:
-        phone = verify_and_get_phone(req.login_token)
-    except JiguangError as e:
-        logger.error("[JG] verify+decrypt failed: %s", e, exc_info=True)
-        raise HTTPException(status_code=502, detail=f"jiguang verify failed: {e}") from e
-
-    return _finish_wechat_bind(
-        db,
-        openid=claims["openid"],
-        wechat_nickname=claims["wnk"],
-        wechat_avatar_url=claims["wav"],
-        phone=phone,
-        device_id=req.device_id,
-    )
-
-
-# ===================== 微信占用冲突(M2) =====================
-
-@router.post(
-    "/wechat/conflict/continue",
-    response_model=WechatBindResultResponse,
-    summary="微信占用冲突·继续绑定(登录老账号,能绑就绑)",
-)
-def wechat_conflict_continue(
-    req: WechatConflictContinueRequest, request: Request, db: DbSession
-) -> WechatBindResultResponse:
-    try:
-        claims = decode_conflict_ticket(req.conflict_ticket)
-    except TokenError as e:
-        raise HTTPException(status_code=401, detail="操作超时,请重新用微信登录") from e
-
-    enforce_rate_limit(
-        request, scope="wechat-conflict-device", subject=req.device_id,
-        limit=SMS_LOGIN_MAX_PER_HOUR, window_sec=3600, detail="操作过于频繁,请稍后再试",
-    )
-
-    user = user_repo.get_user_by_phone(db, claims["phone"])
-    if user is None:
-        # P 期间被腾空(老账号改号/注销)→ 前提已变,让前端重走
-        raise HTTPException(status_code=409, detail="账号状态已变化,请重新登录")
-    if user.status != "active":
-        raise HTTPException(status_code=403, detail="account disabled")
-
-    if user.wechat_openid is None:
-        try:
-            user_repo.attach_wechat_to_user(
-                db, user, openid=claims["openid"],
-                wechat_nickname=claims["wnk"], wechat_avatar_url=claims["wav"],
-            )
-        except IntegrityError:
-            db.rollback()  # openid 被别处绑走 → 只登入不绑
-            user_repo.touch_last_login(db, user)
-    else:
-        user_repo.touch_last_login(db, user)  # X 已绑别的微信 → 只登入,丢弃本次 openid
-
-    completed = onboarding_repo.is_completed(db, user_id=user.id, device_id=req.device_id)
-    logger.info("wechat conflict continue user_id=%d openid=%s***", user.id, claims["openid"][:6])
-    return WechatBindResultResponse(
-        status="logged_in",
-        token=_login_response(user, onboarding_completed=completed),
-    )
-
-
-@router.post(
-    "/wechat/conflict/rebind",
-    response_model=WechatBindResultResponse,
-    summary="微信占用冲突·换绑(注销老账号+用该号重建全新账号)",
-)
-def wechat_conflict_rebind(
-    req: WechatConflictRebindRequest, request: Request, db: DbSession
-) -> WechatBindResultResponse:
-    from app.core.config import settings  # 局部 import,避免循环
-
-    try:
-        claims = decode_conflict_ticket(req.conflict_ticket)
-    except TokenError as e:
-        raise HTTPException(status_code=401, detail="操作超时,请重新用微信登录") from e
-
-    enforce_rate_limit(
-        request, scope="wechat-conflict-device", subject=req.device_id,
-        limit=SMS_LOGIN_MAX_PER_HOUR, window_sec=3600, detail="操作过于频繁,请稍后再试",
-    )
-
-    phone = claims["phone"]
-    if rebind_repo.rebound_within_days(db, phone, settings.PHONE_REBIND_LIMIT_DAYS):
-        days = rebind_repo.remaining_block_days(db, phone, settings.PHONE_REBIND_LIMIT_DAYS)
-        raise HTTPException(status_code=409, detail=f"该手机号 {days} 天内已换绑过,暂不能再次换绑")
-
-    user = user_repo.rebind_account(
-        db, phone=phone, openid=claims["openid"],
-        wechat_nickname=claims["wnk"], wechat_avatar_url=claims["wav"],
-    )
-    completed = onboarding_repo.is_completed(db, user_id=user.id, device_id=req.device_id)
-    logger.info("wechat conflict rebind new_user_id=%d phone=%s openid=%s***",
-                user.id, mask_phone(phone), claims["openid"][:6])
-    return WechatBindResultResponse(
-        status="logged_in",
-        token=_login_response(user, onboarding_completed=completed),
-    )
-
-
 # ===================== Refresh =====================
 
 @router.post("/refresh", response_model=TokenPair, summary="用 refresh_token 换新 token 对")

app/api/v1/device.py

@@ -40,6 +40,7 @@ def register_device(
         user_id=user.id,
         device_id=req.device_id,
         registration_id=req.registration_id,
+        oppo_register_id=req.oppo_register_id,
         platform=req.platform,
         app_version=req.app_version,
     )
@@ -64,6 +65,7 @@ def report_heartbeat(
         device_id=req.device_id,
         accessibility_enabled=req.accessibility_enabled,
         registration_id=req.registration_id,
+        oppo_register_id=req.oppo_register_id,
     )
     return OkResponse()
 

app/api/v1/wx_mp.py

@@ -0,0 +1,106 @@
+"""微信服务号消息接收回调 /wx/mp/callback(裸路径, 非 /api/v1)。
+
+对应公众平台"设置与开发 → 基本配置 → 服务器配置"里填的 URL。
+  GET  : URL 接入验证 → 校验 signature → 原样返回 echostr(明文)
+  POST : 收用户消息(安全模式密文) → msg_signature 验签 → AES 解密 → 解析 XML
+         图片消息(MsgType=image): 打日志(openid/PicUrl/MediaId) + 用 PicUrl 下载落盘
+         其余消息/事件: 记一条日志忽略。一律返回 "success"(微信据此不再重试)。
+
+MVP 只做"收到图片并落盘"证明链路通;后续接:识别平台+订单 → 打 pending_compare 标记
+→ 心跳带回前端弹窗,以及 openid↔device 绑定。任何异常都返回 "success"、不让微信重试轰炸。
+"""
+from __future__ import annotations
+
+import logging
+import xml.etree.ElementTree as ET
+from pathlib import Path
+
+import httpx
+from fastapi import APIRouter, Request
+from fastapi.responses import PlainTextResponse
+
+from app.core.config import settings
+from app.integrations import wx_mp_crypto
+
+logger = logging.getLogger("shagua.wx_mp")
+
+router = APIRouter(prefix="/wx/mp", tags=["wx-mp"])
+
+# 收到的截图暂存目录(MVP 验证用;接上识别后可改为不落盘或定期清理)
+_INBOX = Path(settings.MEDIA_ROOT) / "wx_inbox"
+
+
+@router.get("/callback", include_in_schema=False)
+async def verify(
+    signature: str = "", timestamp: str = "", nonce: str = "", echostr: str = ""
+) -> PlainTextResponse:
+    """微信 URL 接入验证:校验 signature 通过则原样返回 echostr。"""
+    if not settings.WX_MP_TOKEN:
+        logger.warning("wx_mp verify: WX_MP_TOKEN 未配置")
+        return PlainTextResponse("", status_code=503)
+    if wx_mp_crypto.verify_url_signature(
+        settings.WX_MP_TOKEN, timestamp, nonce, signature
+    ):
+        return PlainTextResponse(echostr)
+    logger.warning("wx_mp verify: signature 校验失败 ts=%s nonce=%s", timestamp, nonce)
+    return PlainTextResponse("invalid signature", status_code=403)
+
+
+@router.post("/callback", include_in_schema=False)
+async def receive(request: Request) -> PlainTextResponse:
+    """收用户消息(安全模式)。任何异常都吞掉返回 success,不让微信重试轰炸,靠日志排查。"""
+    if not settings.wx_mp_callback_configured:
+        logger.warning("wx_mp receive: 回调凭证未配齐(Token/AESKey/AppID)")
+        return PlainTextResponse("success")
+    try:
+        body = (await request.body()).decode("utf-8")
+        qp = request.query_params
+        # 安全模式外层 XML 只有 ToUserName + Encrypt。来源=微信服务器(HTTPS)+ 下面验签,
+        # 且 stdlib ET 不扩展外部实体, XXE 不适用。
+        encrypt = ET.fromstring(body).findtext("Encrypt") or ""
+        if not wx_mp_crypto.verify_msg_signature(
+            settings.WX_MP_TOKEN,
+            qp.get("timestamp", ""),
+            qp.get("nonce", ""),
+            encrypt,
+            qp.get("msg_signature", ""),
+        ):
+            logger.warning("wx_mp receive: msg_signature 校验失败")
+            return PlainTextResponse("success")
+        xml = wx_mp_crypto.decrypt_message(
+            settings.WX_MP_AES_KEY, settings.WX_MP_APPID, encrypt
+        )
+        await _handle_message(ET.fromstring(xml))
+    except Exception:
+        logger.exception("wx_mp receive: 处理异常")
+    return PlainTextResponse("success")
+
+
+async def _handle_message(root: ET.Element) -> None:
+    openid = root.findtext("FromUserName") or ""
+    msg_type = root.findtext("MsgType") or ""
+    if msg_type == "image":
+        pic_url = root.findtext("PicUrl") or ""
+        media_id = root.findtext("MediaId") or ""
+        logger.info(
+            "wx_mp 收到图片: openid=%s media_id=%s pic_url=%s", openid, media_id, pic_url
+        )
+        await _download(pic_url, openid, media_id)
+    else:
+        logger.info("wx_mp 收到消息(暂忽略): openid=%s type=%s", openid, msg_type)
+
+
+async def _download(pic_url: str, openid: str, media_id: str) -> None:
+    """用 PicUrl 直接下载图片落盘。PicUrl 是临时公网链接,无需 access_token / IP 白名单。"""
+    if not pic_url:
+        return
+    try:
+        _INBOX.mkdir(parents=True, exist_ok=True)
+        async with httpx.AsyncClient(timeout=15) as client:
+            resp = await client.get(pic_url)
+            resp.raise_for_status()
+        dest = _INBOX / f"{openid[:12]}_{media_id[:16]}.jpg"
+        dest.write_bytes(resp.content)
+        logger.info("wx_mp 图片已落盘: %s (%d bytes)", dest, len(resp.content))
+    except Exception:
+        logger.exception("wx_mp 图片下载失败 pic_url=%s", pic_url)

app/core/config.py

@@ -44,11 +44,6 @@ class Settings(BaseSettings):
     JWT_ALGORITHM: str = "HS256"
     JWT_ACCESS_TOKEN_EXPIRE_MINUTES: int = 120
     JWT_REFRESH_TOKEN_EXPIRE_DAYS: int = 30
-    # 微信登录未命中 openid 时签发的"待绑手机"令牌有效期(JWT_SECRET_KEY 签名,typ=wechat_bind;
-    # 见 security.create_bind_ticket)。需覆盖"授权→输手机号→收短信→输验证码"整个绑定流程。
-    WECHAT_BIND_TICKET_EXPIRE_MINUTES: int = 10
-    # 一个手机号 30 天内最多换绑一次(微信占用冲突页的"换绑"动作)。见 phone_rebind_log。
-    PHONE_REBIND_LIMIT_DAYS: int = 30
 
     # ===== Admin 后台 =====
     # admin 用独立 JWT secret(≠ JWT_SECRET_KEY),App 用户 token 无法越权访问后台。
@@ -76,6 +71,34 @@ class Settings(BaseSettings):
     HEARTBEAT_TIMEOUT_MINUTES: int = 60          # 多久没心跳算掉线(1 小时,避免短暂离线误判被杀)
     HEARTBEAT_SCAN_INTERVAL_SEC: int = 60        # 扫描周期
 
+    # ===== OPPO 推送(厂商通道直连) =====
+    # 直连 OPPO PUSH 服务端 API(api.push.oppomobile.com), 不经极光。凭证来自 OPPO 开放平台
+    # 注册应用后分配(≠极光 JG_*)。两步鉴权: 先 /server/v1/auth 用 sha256(app_key+timestamp+
+    # master_secret) 换 auth_token(缓存 24h), 再带 auth_token 调 /message/notification/unicast
+    # 单推。提现审核通过等交易类通知走这条。未配凭证 → oppo_push_configured=False, 发送方静默
+    # 跳过(不连累审核/打款)。
+    OPPO_PUSH_ENABLED: bool = True               # 总开关(配了凭证也能置 False 全局停发)
+    OPPO_PUSH_APP_KEY: str = ""
+    OPPO_PUSH_MASTER_SECRET: str = ""
+    OPPO_PUSH_AUTH_ENDPOINT: str = "https://api.push.oppomobile.com/server/v1/auth"
+    OPPO_PUSH_UNICAST_ENDPOINT: str = (
+        "https://api.push.oppomobile.com/server/v1/message/notification/unicast"
+    )
+    OPPO_PUSH_REQUEST_TIMEOUT_SEC: int = 10
+    # 通知点击行为(OPPO click_action_type; 0=启动应用首页)。交易类通知点开进首页即可。
+    OPPO_PUSH_CLICK_ACTION_TYPE: int = 0
+    # 通知渠道 id(Android 8+ NotificationChannel): 【客户端创建的渠道】+【OPPO 管理台登记】+
+    # 【服务端此值】三方必须一致, 否则真机可能不展示。客户端 OppoPushHelper.CHANNEL_ID 同值。
+    OPPO_PUSH_CHANNEL_ID: str = "push_oplus_category_content"
+    # OPPO 新消息分类(Android 12+ 触达; 提现属 ACCOUNT 账号资产变化)。默认空=不带该字段——
+    # 它依赖 OPPO 管理台的消息分类资质, 未开通就带上可能反被限制, 确认资质后再填(如 "ACCOUNT")。
+    OPPO_PUSH_CATEGORY: str = ""
+
+    @property
+    def oppo_push_configured(self) -> bool:
+        """OPPO 推送凭证是否齐备(app_key + master_secret)。缺任一 → 发送方静默跳过。"""
+        return bool(self.OPPO_PUSH_APP_KEY and self.OPPO_PUSH_MASTER_SECRET)
+
     # ===== 短信 =====
     SMS_MOCK: bool = True
     SMS_CODE_TTL_SEC: int = 300
@@ -86,7 +109,6 @@ class Settings(BaseSettings):
     SMS_SIGN_ID: int = 31729       # 极光短信签名 ID(非机密,可被 .env 覆盖)
     SMS_TEMPLATE_ID: int = 1       # 极光短信模板 ID(变量名 code,有效期 5 分钟)
     SMS_CODE_LENGTH: int = 6       # 验证码位数(本服务生成;前端 code 字段 4-8 位兼容)
-    SMS_DAILY_LIMIT_PER_PHONE: int = 10   # 单手机号每日发送上限(防刷 + 控费)
     SMS_MAX_VERIFY_ATTEMPTS: int = 5      # 单个验证码最多校验失败次数,超过即作废(防爆破)
 
     # ===== 测试账号(release 包全流程联调用)=====
@@ -112,9 +134,6 @@ class Settings(BaseSettings):
     # 美团调用走的代理。本机开发直连美团会 SSL EOF,需填 http://127.0.0.1:7897;
     # 线上国内服务器留空(=直连)。见 .env.example 与 integrations/meituan.py。
     MT_CPS_PROXY: str = ""
-    # 本地开发:开启后 /feed 接口直接返回 mock 数据,不调美团 API、不查离线库,
-    # 方便前端联调 feed 卡片样式、分页、距离排序等 UI。生产必须 false。
-    MT_CPS_MOCK_FEED: bool = True
 
     @property
     def mt_cps_configured(self) -> bool:
@@ -145,6 +164,12 @@ class Settings(BaseSettings):
     # (不跳授权、不拿 openid),整套微信代码保留。审核通过后 .env 置 true + 重启即启用,无需改代码。
     WX_MP_OAUTH_ENABLED: bool = False
 
+    # ===== 微信服务号(消息接收回调) =====
+    # 用户发消息给服务号 → 微信 POST 到 /wx/mp/callback(安全模式:Token 验签 + AESKey 解密)。
+    # 区别于上面的网页授权(那是落地页拿 openid);这里是被动收用户主动发来的消息(截图比价入口)。
+    WX_MP_TOKEN: str = ""            # 公众平台"服务器配置"的 Token(URL 验签 + 消息验签)
+    WX_MP_AES_KEY: str = ""          # EncodingAESKey(43 位, 消息 AES-256-CBC 加解密)
+
     @property
     def wx_mp_configured(self) -> bool:
         """服务号网页授权凭证齐全(缺则落地页不发起授权,降级为无 openid)。"""
@@ -155,6 +180,11 @@ class Settings(BaseSettings):
         """落地页是否真正发起微信授权 = 凭证齐全 且 总开关开。"""
         return self.wx_mp_configured and self.WX_MP_OAUTH_ENABLED
 
+    @property
+    def wx_mp_callback_configured(self) -> bool:
+        """消息接收回调凭证齐全(Token + AESKey + AppID)。缺则回调端点拒绝处理消息。"""
+        return bool(self.WX_MP_TOKEN and self.WX_MP_AES_KEY and self.WX_MP_APPID)
+
     # ===== 微信支付(商家转账到零钱 / 提现)=====
     # 真实凭证放 .env(已 gitignore),证书 .pem 放 secrets/。WECHAT_APP_ID 同时用于
     # 微信登录(code 换 openid)与转账,必须与 App 端开放平台 appid 一致。

app/core/ratelimit.py

@@ -9,41 +9,29 @@ from __future__ import annotations
 
 import threading
 import time
-from typing import NamedTuple
 
 from fastapi import HTTPException, Request, status
 
 from app.core.config import settings
 
-# key -> (window_start_ts, count, window_sec)
-# 存每个 key 自己的 window_sec:_buckets 混着不同窗口(60s 广告 / 3600s 登录 / 86400s 日闸)的 key,
-# GC 必须按各 key 自己的窗口判过期(见 [_purge_expired]),否则短窗口调用触发的 GC 会误删长窗口 key。
-_buckets: dict[str, tuple[float, int, float]] = {}
+# key -> (window_start_ts, count)
+_buckets: dict[str, tuple[float, int]] = {}
 _lock = threading.Lock()
-_GC_THRESHOLD = 10000  # _buckets 超此阈值才顺手清过期 key(仿 sms.py;测试可 monkeypatch 调小强制每次扫)
-
-
-def _purge_expired(now: float) -> None:
-    """清过期 key(**仅在持有 _lock 时调用**)。按每个 key 自己存的 window_sec 判过期,而非调用方的窗口
-    —— _buckets 是全局共享、混着 60s(广告)/3600s(登录)/86400s(日闸)不同窗口的 key;若用调用方窗口,
-    高频的 60s 广告端点触发 GC 时会把本该活 3600s/86400s 的登录/日闸计数一并删掉,使其在规模上(超阈值才
-    触发本清理)被反复清零而失效。仅在超阈值时扫,低频、开销可忽略。"""
-    if len(_buckets) <= _GC_THRESHOLD:
-        return
-    for k in [k for k, (s, _, w) in _buckets.items() if now - s >= w]:
-        _buckets.pop(k, None)
 
 
 def _hit(key: str, limit: int, window_sec: float) -> bool:
     """记一次访问。返回 True=放行,False=超限。"""
     now = time.monotonic()
     with _lock:
-        start, count, _ = _buckets.get(key, (now, 0, window_sec))
+        start, count = _buckets.get(key, (now, 0))
         if now - start >= window_sec:  # 窗口过期,重置
             start, count = now, 0
         count += 1
-        _buckets[key] = (start, count, window_sec)
-        _purge_expired(now)  # 顺手清过期 key(按各自窗口),防内存无限涨
+        _buckets[key] = (start, count)
+        # 顺手清理过期 key,防内存无限涨(低频访问足够)
+        if len(_buckets) > 10000:
+            for k in [k for k, (s, _) in _buckets.items() if now - s >= window_sec]:
+                _buckets.pop(k, None)
     return count <= limit
 
 
@@ -95,76 +83,3 @@ def enforce_rate_limit(
             status_code=status.HTTP_429_TOO_MANY_REQUESTS,
             detail=detail,
         )
-
-
-# ===================== 先判 / 后记(只按「成功」计数)=====================
-# _hit 是原子「判+记」:一调用就 +1,适合登录爆破(失败尝试也要计)。但对「短信发码」这类
-# **只想给成功动作计数**的场景不合适 —— 被单号冷却挡下的重发没真发、没烧钱,不该占额度。
-# 故拆成 _peek(只判不记)+ _commit(只记):check_rate_limits 先判 → 动作 → 成功后 record。
-
-
-class RateLimitRule(NamedTuple):
-    """一条限流规则。scope 区分不同闸(不同 key 前缀);同一 (subject, IP) 在 window_sec
-    内最多 limit 次,超限抛 429 用 detail 文案。
-
-    (scope, window_sec) 成对绑在一条规则里 —— check(先判)与 record(计数)复用同一条,
-    避免两处把窗口/scope 写歪导致 key 对不上。
-    """
-
-    scope: str
-    limit: int
-    window_sec: float
-    detail: str = "操作过于频繁,请稍后再试"
-
-
-def _peek(key: str, limit: int, window_sec: float) -> bool:
-    """只读:当前窗口内是否还没到上限(count < limit)。**不改计数**。
-    与 [_commit] 配对实现「先判后记」——只在动作成功后才 _commit。"""
-    now = time.monotonic()
-    with _lock:
-        start, count, _ = _buckets.get(key, (now, 0, window_sec))
-        if now - start >= window_sec:  # 窗口已过期 → 视作已重置(count 归零)
-            count = 0
-    return count < limit
-
-
-def _commit(key: str, window_sec: float) -> None:
-    """记一次访问(+1)。窗口过期则以本次为起点重置。仅在动作成功后调用。"""
-    now = time.monotonic()
-    with _lock:
-        start, count, _ = _buckets.get(key, (now, 0, window_sec))
-        if now - start >= window_sec:  # 窗口过期,重置
-            start, count = now, 0
-        _buckets[key] = (start, count + 1, window_sec)
-        _purge_expired(now)  # 顺手清过期 key(按各自窗口,同 [_hit])
-
-
-def check_rate_limits(request: Request, subject: str, rules: list[RateLimitRule]) -> None:
-    """【先判】一组限流:任一规则已达上限即抛 429,且**不改计数**。
-
-    配合 [record_rate_limits] 实现「只按成功计数」:先 check 所有闸(全未超才继续)→ 执行动作
-    → 动作**成功后**再 record。动作被下游挡下(如短信单号冷却)、没真正发生时不 record → 不占额度。
-    key = `scope:subject:client_ip`(与 [enforce_rate_limit] 同款)。
-    """
-    if not settings.RATE_LIMIT_ENABLED:
-        return
-    ip = _client_ip(request)
-    for rule in rules:
-        if not _peek(f"{rule.scope}:{subject}:{ip}", rule.limit, rule.window_sec):
-            raise HTTPException(
-                status_code=status.HTTP_429_TOO_MANY_REQUESTS,
-                detail=rule.detail,
-            )
-
-
-def record_rate_limits(request: Request, subject: str, rules: list[RateLimitRule]) -> None:
-    """【记一次】一组限流(每条规则 +1)。仅在动作成功后调用,与 [check_rate_limits] 配对。
-
-    ⚠️ check→动作→record 非原子:并发突发下计数可能略超 limit(每个在途请求各 +1)。对
-    「防脚本/防轰炸」的安全网定位可接受;要精确配额需迁 Redis(见模块 docstring)。
-    """
-    if not settings.RATE_LIMIT_ENABLED:
-        return
-    ip = _client_ip(request)
-    for rule in rules:
-        _commit(f"{rule.scope}:{subject}:{ip}", rule.window_sec)

app/core/security.py

@@ -87,91 +87,6 @@ def issue_token_pair(user_id: int) -> dict[str, Any]:
     }
 
 
-def create_bind_ticket(
-    *, openid: str, wechat_nickname: str | None, wechat_avatar_url: str | None
-) -> str:
-    """微信登录未命中 openid 时,签发短时"待绑手机"令牌,承载 openid + 微信昵称头像。
-
-    typ='wechat_bind'、sub=openid;有效期 settings.WECHAT_BIND_TICKET_EXPIRE_MINUTES 分钟。
-    与 access/refresh 用同一 JWT_SECRET_KEY 签名,靠 typ 区分,decode_bind_ticket 校验 typ。
-    """
-    now = _now()
-    expire = now + timedelta(minutes=settings.WECHAT_BIND_TICKET_EXPIRE_MINUTES)
-    payload: dict[str, Any] = {
-        "sub": openid,
-        "typ": "wechat_bind",
-        "wnk": wechat_nickname,
-        "wav": wechat_avatar_url,
-        "iat": int(now.timestamp()),
-        "exp": int(expire.timestamp()),
-    }
-    return jwt.encode(payload, settings.JWT_SECRET_KEY, algorithm=settings.JWT_ALGORITHM)
-
-
-def decode_bind_ticket(token: str) -> dict[str, Any]:
-    """解析"待绑手机"令牌,校验签名/过期/类型。失败抛 TokenError。
-
-    返回 {'openid': str, 'wnk': str|None, 'wav': str|None}。
-    """
-    try:
-        payload = jwt.decode(token, settings.JWT_SECRET_KEY, algorithms=[settings.JWT_ALGORITHM])
-    except jwt.ExpiredSignatureError as e:
-        raise TokenError("bind ticket expired") from e
-    except jwt.InvalidTokenError as e:
-        raise TokenError(f"invalid bind ticket: {e}") from e
-    if payload.get("typ") != "wechat_bind":
-        raise TokenError(f"wrong token type: want=wechat_bind got={payload.get('typ')}")
-    if "sub" not in payload:
-        raise TokenError("bind ticket missing sub")
-    return {"openid": payload["sub"], "wnk": payload.get("wnk"), "wav": payload.get("wav")}
-
-
-def create_conflict_ticket(
-    *, openid: str, wechat_nickname: str | None, wechat_avatar_url: str | None, phone: str
-) -> str:
-    """手机号占用时签发的短时"冲突处理"令牌。
-
-    比 bind_ticket 多编码 **已验证的手机号 phone** —— 换绑/继续绑定只认它,证明"这对
-    openid/手机号刚在绑号时验证通过",免用户重输验证码,又堵住"拿自己 openid + 任意手机号
-    去夺号"的接管漏洞。typ='wechat_conflict';有效期复用 WECHAT_BIND_TICKET_EXPIRE_MINUTES。
-    """
-    now = _now()
-    expire = now + timedelta(minutes=settings.WECHAT_BIND_TICKET_EXPIRE_MINUTES)
-    payload: dict[str, Any] = {
-        "sub": openid,
-        "typ": "wechat_conflict",
-        "wnk": wechat_nickname,
-        "wav": wechat_avatar_url,
-        "phn": phone,
-        "iat": int(now.timestamp()),
-        "exp": int(expire.timestamp()),
-    }
-    return jwt.encode(payload, settings.JWT_SECRET_KEY, algorithm=settings.JWT_ALGORITHM)
-
-
-def decode_conflict_ticket(token: str) -> dict[str, Any]:
-    """解析"冲突处理"令牌,校验签名/过期/类型。失败抛 TokenError。
-
-    返回 {'openid': str, 'wnk': str|None, 'wav': str|None, 'phone': str}。
-    """
-    try:
-        payload = jwt.decode(token, settings.JWT_SECRET_KEY, algorithms=[settings.JWT_ALGORITHM])
-    except jwt.ExpiredSignatureError as e:
-        raise TokenError("conflict ticket expired") from e
-    except jwt.InvalidTokenError as e:
-        raise TokenError(f"invalid conflict ticket: {e}") from e
-    if payload.get("typ") != "wechat_conflict":
-        raise TokenError(f"wrong token type: want=wechat_conflict got={payload.get('typ')}")
-    if "sub" not in payload or "phn" not in payload:
-        raise TokenError("conflict ticket missing sub/phn")
-    return {
-        "openid": payload["sub"],
-        "wnk": payload.get("wnk"),
-        "wav": payload.get("wav"),
-        "phone": payload["phn"],
-    }
-
-
 # ===================== 密码 hash(admin 后台账号用)=====================
 # 用户侧是手机号+验证码登录,不存密码;仅 admin 账号用 username+password 登录。
 

app/integrations/oppo_push.py

@@ -0,0 +1,183 @@
+"""OPPO 推送服务端直连(厂商通道)。
+
+不经极光, 直接调 OPPO PUSH 服务端 API(api.push.oppomobile.com)。提现审核通过等交易类
+通知走这条。凭证来自 OPPO 开放平台(app_key/master_secret, 见 settings.OPPO_PUSH_*)。
+
+两步鉴权(OPPO 协议):
+  1. POST /server/v1/auth  用 sign=sha256(app_key+timestamp+master_secret) 换 auth_token
+     (有效期 24h)。token 进程内缓存复用, 到期前自动重取。
+  2. POST /server/v1/message/notification/unicast  header 带 auth_token, 按单个
+     registration_id(OPPO 的 registerID) 定向推送一条通知栏消息。
+
+发送 best-effort: 未配凭证 / 网络失败 / OPPO 返错都抛 OppoPushError, 由调用方(push_notify)
+吞掉只记日志, 绝不连累审核/打款主流程。风格对齐 integrations/sms.py(httpx 同步 + 未配降级)。
+"""
+from __future__ import annotations
+
+import hashlib
+import json
+import logging
+import time
+from dataclasses import dataclass
+from threading import Lock
+
+import httpx
+
+from app.core.config import settings
+
+logger = logging.getLogger("shagua.oppo_push")
+
+# OPPO target_type 枚举: 2 = 按 registration_id 单推
+_TARGET_TYPE_REGISTRATION_ID = 2
+# auth_token 官方有效期 24h; 提前 1h 视为过期重取, 留刷新余量(避免边界请求踩到刚过期)
+_TOKEN_TTL_SEC = 24 * 3600
+_TOKEN_REFRESH_MARGIN_SEC = 3600
+
+
+class OppoPushError(Exception):
+    """OPPO 推送失败(未配置 / 鉴权失败 / 网络错误 / OPPO 返错)。调用方 best-effort 吞。"""
+
+
+@dataclass
+class _CachedToken:
+    token: str
+    expires_at: float   # epoch 秒(= 取到 token 的时刻 + 24h)
+
+
+# 进程内存 token 缓存(单 worker 有效; 多 worker 各自缓存, 各自换 token, OPPO 侧无副作用)
+_token_cache: _CachedToken | None = None
+_token_lock = Lock()
+
+
+def _sign(app_key: str, timestamp_ms: int, master_secret: str) -> str:
+    """OPPO 鉴权签名: sha256(app_key + timestamp + master_secret) 十六进制小写。"""
+    raw = f"{app_key}{timestamp_ms}{master_secret}"
+    return hashlib.sha256(raw.encode("utf-8")).hexdigest()
+
+
+def _parse_oppo_response(resp: httpx.Response, phase: str) -> dict | None:
+    """解析 OPPO 统一响应 {code, message, data}: code==0 返 data, 否则抛 OppoPushError。"""
+    try:
+        body = resp.json()
+    except Exception as e:
+        raise OppoPushError(
+            f"OPPO {phase} 响应非 JSON(http={resp.status_code}): {resp.text[:200]}"
+        ) from e
+    if body.get("code") != 0:
+        raise OppoPushError(
+            f"OPPO {phase} 失败 code={body.get('code')} message={body.get('message')!r}"
+        )
+    return body.get("data")
+
+
+def _fetch_auth_token() -> str:
+    """调 /server/v1/auth 换 auth_token。失败抛 OppoPushError。"""
+    timestamp_ms = int(time.time() * 1000)   # 毫秒时间戳(OPPO 允许 ±10 分钟误差)
+    sign = _sign(
+        settings.OPPO_PUSH_APP_KEY, timestamp_ms, settings.OPPO_PUSH_MASTER_SECRET
+    )
+    try:
+        resp = httpx.post(
+            settings.OPPO_PUSH_AUTH_ENDPOINT,
+            data={
+                "app_key": settings.OPPO_PUSH_APP_KEY,
+                "sign": sign,
+                "timestamp": timestamp_ms,
+            },
+            timeout=settings.OPPO_PUSH_REQUEST_TIMEOUT_SEC,
+        )
+    except httpx.HTTPError as e:
+        raise OppoPushError(f"OPPO auth 网络错误: {e}") from e
+
+    data = _parse_oppo_response(resp, "auth")
+    token = (data or {}).get("auth_token")
+    if not token:
+        raise OppoPushError(f"OPPO auth 未返回 auth_token: {resp.text[:200]}")
+    return token
+
+
+def _get_auth_token(force_refresh: bool = False) -> str:
+    """取 auth_token(缓存优先; 到期或 force_refresh 才重取)。线程安全。"""
+    global _token_cache
+    now = time.time()
+    with _token_lock:
+        cache = _token_cache
+        if (
+            not force_refresh
+            and cache is not None
+            and now < cache.expires_at - _TOKEN_REFRESH_MARGIN_SEC
+        ):
+            return cache.token
+        token = _fetch_auth_token()
+        _token_cache = _CachedToken(token=token, expires_at=now + _TOKEN_TTL_SEC)
+        return token
+
+
+def send_notification(
+    registration_id: str,
+    title: str,
+    content: str,
+    *,
+    click_action_type: int | None = None,
+) -> str:
+    """向单个 OPPO registerID 推一条通知栏消息, 返回 OPPO message_id。
+
+    失败(未配置 / 鉴权 / 网络 / OPPO 返错)一律抛 OppoPushError, 由调用方吞。
+    unicast 首次失败时强刷一次 token 重试(覆盖 token 被 OPPO 提前失效的情况); 网络错误不重试。
+    """
+    if not settings.OPPO_PUSH_ENABLED:
+        raise OppoPushError("OPPO 推送总开关关闭(OPPO_PUSH_ENABLED=false)")
+    if not settings.oppo_push_configured:
+        raise OppoPushError("OPPO 推送未配置(缺 OPPO_PUSH_APP_KEY/OPPO_PUSH_MASTER_SECRET)")
+    if not registration_id:
+        raise OppoPushError("registration_id 为空")
+
+    if click_action_type is None:
+        click_action_type = settings.OPPO_PUSH_CLICK_ACTION_TYPE
+    notification = {
+        "title": title,
+        "content": content,
+        "click_action_type": click_action_type,
+    }
+    # channel_id: Android 8+ 通知渠道(客户端已建同名渠道 + OPPO 管理台登记, 三方一致才展示)。
+    if settings.OPPO_PUSH_CHANNEL_ID:
+        notification["channel_id"] = settings.OPPO_PUSH_CHANNEL_ID
+    # category: OPPO 新消息分类(默认空不带; 依赖管理台资质, 见 config 注释)。
+    if settings.OPPO_PUSH_CATEGORY:
+        notification["category"] = settings.OPPO_PUSH_CATEGORY
+    message = {
+        "target_type": _TARGET_TYPE_REGISTRATION_ID,
+        "target_value": registration_id,
+        "notification": notification,
+    }
+    # OPPO unicast body 是 form 编码, message 字段为 JSON 字符串
+    payload = {"message": json.dumps(message, ensure_ascii=False)}
+
+    last_err: OppoPushError | None = None
+    for attempt in range(2):
+        token = _get_auth_token(force_refresh=(attempt == 1))
+        try:
+            resp = httpx.post(
+                settings.OPPO_PUSH_UNICAST_ENDPOINT,
+                data=payload,
+                headers={"auth_token": token},
+                timeout=settings.OPPO_PUSH_REQUEST_TIMEOUT_SEC,
+            )
+        except httpx.HTTPError as e:
+            # 网络错误与 token 无关, 不强刷重试
+            raise OppoPushError(f"OPPO unicast 网络错误: {e}") from e
+        try:
+            data = _parse_oppo_response(resp, "unicast")
+        except OppoPushError as e:
+            last_err = e
+            if attempt == 0:
+                logger.warning("[OPPO] unicast 失败(%s), 强刷 token 重试一次", e)
+                continue
+            raise
+        message_id = (data or {}).get("message_id", "")
+        logger.info(
+            "[OPPO] 推送成功 regId=%s… message_id=%s", registration_id[:12], message_id
+        )
+        return message_id
+    # 理论到不了(第二次失败已 raise); 防御性收尾
+    raise last_err or OppoPushError("OPPO unicast 重试后仍失败")

app/integrations/sms.py

@@ -13,8 +13,7 @@ worker / 多机时内存不共享 → 冷却、校验都会失效,届时迁移
 
 防刷两层(短信花钱 + `/sms/send` 在登录前无法 JWT 鉴权):
   1. 单号 `SMS_SEND_INTERVAL_SEC` 冷却(本文件)
-  2. 单设备(device_id)+ IP 每小时 / 每天频控(api 层 auth.sms_send 的 check/record_rate_limits,
-     **只按成功发码计数** —— 被本文件单号冷却挡下的重发不占额度)+ 极光控制台 IP 白名单/防轰炸(运维侧)。
+  2. 单设备(device_id)每小时频控(api 层 auth.sms_send 内 enforce_rate_limit)+ 极光控制台 IP 白名单/防轰炸(运维侧)。
      ⚠️ 原「单 IP 频控(rate_limit 依赖)」2026-06-26 按产品要求删除、改设备维度;但 device_id 客户端可伪造/轮换,
         脚本轮换 id 能绕过本层 → 挡脚本狂发主要靠极光控制台侧(+ 可选 nginx 限流)。
      ⚠️ 原「单号每日上限」2026-07-03 按精简要求删除(mentor 定:登录风控只留单号冷却 + 单设备频控);

app/integrations/wx_mp_crypto.py

@@ -0,0 +1,69 @@
+"""微信服务号消息接收回调的验签与解密(安全模式)。
+
+服务号"服务器配置"选安全模式后:
+  - URL 接入验证(GET): sha1(sort(token, timestamp, nonce)) == signature → 原样返回 echostr
+  - 消息(POST): body 里 <Encrypt> 是密文;
+      msg_signature = sha1(sort(token, timestamp, nonce, encrypt))
+      密文 AES-256-CBC 解出: random(16B) + msg_len(4B big-endian) + msg + appid, 去 PKCS7(块=32) padding
+
+只做验签 + 解密(收消息)。被动回复(加密)MVP 不需要 —— 收到后走客服消息异步回执。
+密钥/口令来自 settings(WX_MP_TOKEN / WX_MP_AES_KEY / WX_MP_APPID),本模块只做纯算法、不读配置。
+"""
+from __future__ import annotations
+
+import base64
+import hashlib
+import hmac
+
+from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
+
+
+def verify_url_signature(token: str, timestamp: str, nonce: str, signature: str) -> bool:
+    """GET 接入验证:token/timestamp/nonce 三者字典序排序拼接后 sha1。"""
+    return _consteq(_sha1(token, timestamp, nonce), signature)
+
+
+def verify_msg_signature(
+    token: str, timestamp: str, nonce: str, encrypt: str, msg_signature: str
+) -> bool:
+    """POST 消息验签:四者(含密文 encrypt)字典序排序拼接后 sha1。"""
+    return _consteq(_sha1(token, timestamp, nonce, encrypt), msg_signature)
+
+
+def decrypt_message(aes_key_b64: str, expected_appid: str, encrypt_b64: str) -> str:
+    """解密 <Encrypt> 密文, 返回明文消息 XML。appid 不符抛 ValueError。
+
+    aes_key_b64: EncodingAESKey(43 位, 不含结尾 '='), 补 '=' 后 base64 解出 32 字节 AES-256 key。
+    """
+    aes_key = base64.b64decode(aes_key_b64 + "=")  # 43 → 32 bytes
+    iv = aes_key[:16]
+    decryptor = Cipher(algorithms.AES(aes_key), modes.CBC(iv)).decryptor()
+    plain = decryptor.update(base64.b64decode(encrypt_b64)) + decryptor.finalize()
+    plain = _pkcs7_unpad(plain)
+
+    # random(16) + msg_len(4, big-endian) + msg(msg_len) + from_appid
+    content = plain[16:]
+    msg_len = int.from_bytes(content[:4], "big")
+    msg = content[4 : 4 + msg_len]
+    from_appid = content[4 + msg_len :].decode("utf-8")
+    if expected_appid and from_appid != expected_appid:
+        raise ValueError(f"appid mismatch: {from_appid!r} != {expected_appid!r}")
+    return msg.decode("utf-8")
+
+
+def _sha1(*parts: str) -> str:
+    return hashlib.sha1("".join(sorted(parts)).encode("utf-8")).hexdigest()
+
+
+def _consteq(a: str, b: str) -> bool:
+    return hmac.compare_digest(a, b)
+
+
+def _pkcs7_unpad(data: bytes) -> bytes:
+    """微信用块大小 32 的 PKCS7,末字节即 padding 长度(1..32)。越界则原样返回(容错)。"""
+    if not data:
+        return data
+    pad = data[-1]
+    if pad < 1 or pad > 32:
+        return data
+    return data[:-pad]

app/main.py

@@ -39,6 +39,7 @@ from app.api.v1.signin import router as signin_router
 from app.api.v1.tasks import router as tasks_router
 from app.api.v1.user import router as user_router
 from app.api.v1.wallet import router as wallet_router
+from app.api.v1.wx_mp import router as wx_mp_router
 from app.api.v1.wxpay import router as wxpay_router
 from app.core.config import settings
 from app.core.daily_exchange_worker import (
@@ -140,6 +141,8 @@ app.include_router(internal_launch_confirm_router)
 app.include_router(platform_router)
 # CPS 群发短链跳转 /c/{code}(公网无鉴权:记点击 → 302 跳美团)
 app.include_router(cps_redirect_router)
+# 微信服务号消息接收回调 /wx/mp/callback(公网无鉴权:微信服务器验签, 截图比价入口)
+app.include_router(wx_mp_router)
 
 # 用户上传文件(头像)静态服务。生产可改由 nginx 直接 serve MEDIA_ROOT。
 _media_root = Path(settings.MEDIA_ROOT)

app/models/__init__.py

@@ -32,7 +32,6 @@ from app.models.invite_fingerprint import InviteFingerprint  # noqa: F401
 from app.models.launch_confirm_sample import LaunchConfirmSample  # noqa: F401
 from app.models.meituan_coupon import MeituanCoupon  # noqa: F401
 from app.models.onboarding import OnboardingCompletion  # noqa: F401
-from app.models.phone_rebind_log import PhoneRebindLog  # noqa: F401
 from app.models.ops_marquee_seed import OpsMarqueeSeed  # noqa: F401
 from app.models.ops_stat_config import OpsStatConfig  # noqa: F401
 from app.models.price_observation import PriceObservation  # noqa: F401

app/models/device.py

@@ -44,6 +44,9 @@ class DeviceLiveness(Base):
     device_id: Mapped[str] = mapped_column(String(128), index=True, nullable=False)
     # 极光推送 registration id;拿到才填(JCollectionAuth 同意后才下发)
     registration_id: Mapped[str | None] = mapped_column(String(64), nullable=True)
+    # OPPO 官方推送 SDK(HeytapPushManager)的 registerID; 直连 OPPO 厂商通道用(≠极光 registration_id)。
+    # 一台 OPPO 设备两套 token 并存: 极光走极光自有/其它厂商通道, 这个走 OPPO 直连(提现审核通过等交易通知)。
+    oppo_register_id: Mapped[str | None] = mapped_column(String(128), nullable=True)
     platform: Mapped[str] = mapped_column(String(16), nullable=False, default="android")
     app_version: Mapped[str | None] = mapped_column(String(32), nullable=True)
 

app/models/phone_rebind_log.py

@@ -1,31 +0,0 @@
-"""手机号换绑台账。
-
-记录"手机号从老账号被夺走、重建为新账号(X 注销 → Y)"这一破坏性事件,支撑"一个手机号
-30 天内最多换绑一次"的限制。手机号级、渠道无关(source 标来源);普通微信绑定不写此表。
-见 M2 spec §4.1。
-"""
-from __future__ import annotations
-
-from datetime import datetime
-
-from sqlalchemy import DateTime, Integer, String, func
-from sqlalchemy.orm import Mapped, mapped_column
-
-from app.db.base import Base
-
-
-class PhoneRebindLog(Base):
-    __tablename__ = "phone_rebind_log"
-
-    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
-    # 被换绑的真实手机号(注意:存真实号,不是老账号被腾号后的 deleted_<id>)
-    phone: Mapped[str] = mapped_column(String(20), index=True, nullable=False)
-    # 被注销的老账号 X;P 换绑时已被腾空(极边界)则为空
-    old_user_id: Mapped[int | None] = mapped_column(Integer, nullable=True)
-    # 换绑后新建的账号 Y
-    new_user_id: Mapped[int] = mapped_column(Integer, nullable=False)
-    # 换绑来源。手机号级配额、渠道无关,留字段给未来其他换绑路径共用同一份 30 天限制。
-    source: Mapped[str] = mapped_column(String(32), nullable=False, default="wechat_conflict")
-    rebound_at: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), server_default=func.now(), index=True, nullable=False
-    )

app/repositories/device.py

@@ -22,16 +22,18 @@ def register_or_update(
     user_id: int,
     device_id: str,
     registration_id: str | None,
+    oppo_register_id: str | None = None,
     platform: str = "android",
     app_version: str | None = None,
 ) -> DeviceLiveness:
-    """注册设备或更新其 registration_id / 元信息。upsert by (user_id, device_id)。"""
+    """注册设备或更新其 registration_id / oppo_register_id / 元信息。upsert by (user_id, device_id)。"""
     device = _get(db, user_id=user_id, device_id=device_id)
     if device is None:
         device = DeviceLiveness(
             user_id=user_id,
             device_id=device_id,
             registration_id=registration_id,
+            oppo_register_id=oppo_register_id,
             platform=platform or "android",
             app_version=app_version,
         )
@@ -39,6 +41,8 @@ def register_or_update(
     else:
         if registration_id:
             device.registration_id = registration_id
+        if oppo_register_id:
+            device.oppo_register_id = oppo_register_id
         if platform:
             device.platform = platform
         if app_version:
@@ -55,11 +59,13 @@ def touch_heartbeat(
     device_id: str,
     accessibility_enabled: bool,
     registration_id: str | None,
+    oppo_register_id: str | None = None,
 ) -> DeviceLiveness:
     """处理一次心跳(心跳也能自注册)。
 
     service 心跳或 accessibility_enabled=true 时,刷新存活并把状态机重置回 alive、
-    清掉 notified_at(掉线恢复 → 下次再断才会再推一条)。
+    清掉 notified_at(掉线恢复 → 下次再断才会再推一条)。registration_id / oppo_register_id
+    非空时顺带更新(客户端拿到 push token 后每次心跳带上, 后端最终一致)。
     """
     now = datetime.now(timezone.utc)
     device = _get(db, user_id=user_id, device_id=device_id)
@@ -69,6 +75,8 @@ def touch_heartbeat(
 
     if registration_id:
         device.registration_id = registration_id
+    if oppo_register_id:
+        device.oppo_register_id = oppo_register_id
     device.last_report_protection_on = accessibility_enabled
 
     if accessibility_enabled:
@@ -118,6 +126,25 @@ def get_device(db: Session, *, user_id: int, device_id: str) -> DeviceLiveness |
     return _get(db, user_id=user_id, device_id=device_id)
 
 
+def list_oppo_register_ids_by_user(db: Session, *, user_id: int) -> list[str]:
+    """取某用户所有设备已登记的 OPPO registerID(去重保序, 非空)。
+
+    提现审核通过推送用: 一个用户可能多台设备, 每台都推; 没 OPPO token 的设备(非 OPPO 机 /
+    未集成 OPPO SDK)自然不在列。空列表 = 该用户没有可推的 OPPO 设备。
+    """
+    stmt = select(DeviceLiveness.oppo_register_id).where(
+        DeviceLiveness.user_id == user_id,
+        DeviceLiveness.oppo_register_id.is_not(None),
+    )
+    seen: set[str] = set()
+    out: list[str] = []
+    for rid in db.execute(stmt).scalars().all():
+        if rid and rid not in seen:
+            seen.add(rid)
+            out.append(rid)
+    return out
+
+
 def ack_kill_alert(db: Session, *, user_id: int, device_id: str) -> None:
     """客户端已弹过「开启自启动」引导 → 清「待提醒」标记(幂等; 下次真掉线 worker 再置)。"""
     device = _get(db, user_id=user_id, device_id=device_id)

app/repositories/phone_rebind.py

@@ -1,39 +0,0 @@
-"""手机号换绑台账(phone_rebind_log)的查询与写入。见 M2 spec §4.1。"""
-from __future__ import annotations
-
-import math
-from datetime import datetime, timedelta, timezone
-
-from sqlalchemy import func, select
-from sqlalchemy.orm import Session
-
-from app.models.phone_rebind_log import PhoneRebindLog
-
-
-def rebound_within_days(db: Session, phone: str, days: int) -> bool:
-    """该手机号在最近 days 天内是否换绑过(命中 → 禁止再次换绑)。"""
-    since = datetime.now(timezone.utc) - timedelta(days=days)
-    stmt = (
-        select(PhoneRebindLog.id)
-        .where(PhoneRebindLog.phone == phone, PhoneRebindLog.rebound_at >= since)
-        .limit(1)
-    )
-    return db.execute(stmt).first() is not None
-
-
-def remaining_block_days(db: Session, phone: str, days: int) -> int:
-    """距离该手机号可再次换绑还剩几天(向上取整;无记录返回 0)。"""
-    last = db.execute(
-        select(func.max(PhoneRebindLog.rebound_at)).where(PhoneRebindLog.phone == phone)
-    ).scalar_one_or_none()
-    if last is None:
-        return 0
-    if last.tzinfo is None:  # SQLite 取回 naive datetime,按 UTC 归一
-        last = last.replace(tzinfo=timezone.utc)
-    remaining = (last + timedelta(days=days) - datetime.now(timezone.utc)).total_seconds()
-    return max(0, math.ceil(remaining / 86400))
-
-
-def add_rebind_log(db: Session, *, phone: str, old_user_id: int | None, new_user_id: int, source: str) -> None:
-    """写一条换绑台账(**不 commit**,交给调用方 rebind_account 的单事务)。"""
-    db.add(PhoneRebindLog(phone=phone, old_user_id=old_user_id, new_user_id=new_user_id, source=source))

app/repositories/user.py

@@ -12,7 +12,6 @@ from sqlalchemy import select
 from sqlalchemy.orm import Session
 
 from app.models.user import User
-from app.repositories import phone_rebind
 
 
 # ===== 创建时分配的标识:用户名(对外展示账号 ID)+ 默认昵称 =====
@@ -59,17 +58,6 @@ def is_default_nickname(nickname: str | None) -> bool:
     )
 
 
-def apply_wechat_display_identity(
-    user: User, *, wechat_nickname: str | None, wechat_avatar_url: str | None
-) -> None:
-    """§10:用已有账号绑微信时,仅当展示字段仍为默认才用微信昵称/头像替换(两规则独立);
-    自定义(改过昵称/传过头像)则保留。只改内存对象,由调用方 commit。"""
-    if is_default_nickname(user.nickname) and wechat_nickname:
-        user.nickname = wechat_nickname
-    if user.avatar_url is None and wechat_avatar_url:
-        user.avatar_url = wechat_avatar_url
-
-
 def get_user_by_username(db: Session, username: str) -> User | None:
     return db.execute(
         select(User).where(User.username == username)
@@ -98,85 +86,6 @@ def get_user_by_phone(db: Session, phone: str) -> User | None:
     return db.execute(stmt).scalar_one_or_none()
 
 
-def get_user_by_wechat_openid(db: Session, openid: str) -> User | None:
-    stmt = select(User).where(User.wechat_openid == openid)
-    return db.execute(stmt).scalar_one_or_none()
-
-
-def touch_last_login(db: Session, user: User) -> User:
-    """openid 命中登录时更新 last_login_at(手机号登录在 upsert_user_for_login 里已更新)。"""
-    user.last_login_at = datetime.now(timezone.utc)
-    db.commit()
-    db.refresh(user)
-    return user
-
-
-def attach_wechat_to_user(
-    db: Session, user: User, *, openid: str, wechat_nickname: str | None, wechat_avatar_url: str | None
-) -> User:
-    """继续绑定:把微信 openid + 微信源字段并入已存在账号(调用方保证 user.wechat_openid 为空)。
-
-    写 wechat_openid / wechat_nickname / wechat_avatar_url,并按 §10 规则回填展示字段:
-    仅当昵称仍为默认值(is_default_nickname)时用微信昵称替换,仅当头像为 null 时用微信头像替换;
-    用户已自定义的展示昵称/头像始终保留,两规则相互独立。
-    撞 openid 唯一约束(O 期间被别处绑走,极罕见)时由调用方捕获 IntegrityError 兜底降级为"只登入不绑"。
-    """
-    user.wechat_openid = openid
-    user.wechat_nickname = wechat_nickname
-    user.wechat_avatar_url = wechat_avatar_url
-    user.last_login_at = datetime.now(timezone.utc)
-    apply_wechat_display_identity(user, wechat_nickname=wechat_nickname, wechat_avatar_url=wechat_avatar_url)
-    db.commit()
-    db.refresh(user)
-    return user
-
-
-def _build_wechat_user(
-    db: Session,
-    *,
-    phone: str,
-    openid: str,
-    wechat_nickname: str | None,
-    wechat_avatar_url: str | None,
-) -> User:
-    """构造并 db.add 一个微信账号行(register_channel='wechat',展示昵称头像取微信,缺则默认),
-    **不 commit**。create_wechat_user 与 rebind_account 共用,保证建号逻辑单一来源。"""
-    user = User(
-        phone=phone,
-        username=_gen_unique_username(db),
-        nickname=wechat_nickname or _gen_nickname(),
-        avatar_url=wechat_avatar_url,
-        register_channel="wechat",
-        wechat_openid=openid,
-        wechat_nickname=wechat_nickname,
-        wechat_avatar_url=wechat_avatar_url,
-        last_login_at=datetime.now(timezone.utc),
-    )
-    db.add(user)
-    return user
-
-
-def create_wechat_user(
-    db: Session,
-    *,
-    phone: str,
-    openid: str,
-    wechat_nickname: str | None,
-    wechat_avatar_url: str | None,
-) -> User:
-    """微信登录新建账号(未占用分支)。见 _build_wechat_user。
-
-    openid 唯一约束是并发/重复绑定的最终防线(极罕见,openid 在 wechat-login 刚查过为空)。
-    """
-    user = _build_wechat_user(
-        db, phone=phone, openid=openid,
-        wechat_nickname=wechat_nickname, wechat_avatar_url=wechat_avatar_url,
-    )
-    db.commit()
-    db.refresh(user)
-    return user
-
-
 def upsert_user_for_login(
     db: Session,
     *,
@@ -245,44 +154,3 @@ def soft_delete_account(db: Session, user: User) -> None:
     # 释放邀请码唯一槽
     user.invite_code = None
     db.commit()
-
-
-def rebind_account(
-    db: Session,
-    *,
-    phone: str,
-    openid: str,
-    wechat_nickname: str | None,
-    wechat_avatar_url: str | None,
-    source: str = "wechat_conflict",
-) -> User:
-    """换绑:**单事务内**注销老账号 X(腾出手机号)+ 用该号建全新微信账号 Y + 写换绑台账。
-
-    - 老账号可能已不存在(P 被腾空)→ old_user_id=None,直接建 Y(幂等更稳)。
-    - 手机号唯一约束靠时序:先把 X.phone 改名并 flush 腾号,再插 Y。
-    - 全程不中途 commit,任一步失败整体回滚,绝不出现"X 删了 Y 没建"。
-    X 的字段变更等价 soft_delete_account(软删 + 匿名化 + 释放 openid/邀请码唯一槽),但不在此 commit。
-    """
-    old = get_user_by_phone(db, phone)
-    old_id = old.id if old is not None else None
-    if old is not None:
-        old.status = "deleted"
-        old.phone = f"deleted_{old.id}"
-        old.nickname = None
-        old.avatar_url = None
-        old.wechat_openid = None
-        old.wechat_nickname = None
-        old.wechat_avatar_url = None
-        old.invite_code = None
-        db.flush()  # 先落 phone 改名,腾出手机号唯一约束,才能给 Y 用
-    new_user = _build_wechat_user(
-        db, phone=phone, openid=openid,
-        wechat_nickname=wechat_nickname, wechat_avatar_url=wechat_avatar_url,
-    )
-    db.flush()  # 拿 new_user.id
-    phone_rebind.add_rebind_log(
-        db, phone=phone, old_user_id=old_id, new_user_id=new_user.id, source=source
-    )
-    db.commit()
-    db.refresh(new_user)
-    return new_user

app/repositories/wallet.py

@@ -20,7 +20,6 @@ from app.core.config import settings
 from app.core.rewards import COIN_PER_CENT, coins_to_cents
 from app.integrations import wxpay
 from app.models.user import User
-from app.repositories.user import apply_wechat_display_identity
 from app.models.wallet import (
     CashTransaction,
     CoinAccount,
@@ -35,10 +34,6 @@ _WX_STATE_SUCCESS = "SUCCESS"
 _WX_STATE_FAILED = {"FAIL", "CANCELLED", "CLOSED"}
 _WX_STATE_WAIT_CONFIRM = "WAIT_USER_CONFIRM"  # 用户还没在微信确认页确认
 _WITHDRAW_ACTIVE_STATUSES = {"reviewing", "pending"}
-# 占用新人档「一次性」资格的提现状态:进行中(reviewing/pending)或成功打款(success)。
-# 被拒/转账失败/解绑退回(rejected/failed,均已退款、钱没到手)不在此列 → 新人档恢复可提
-# (2026-07-16 修正:此前判定不看状态,解绑微信退回后 0.1 被误判已用、资格永久锁死)。
-_NEWBIE_TIER_HELD_STATUSES = {"reviewing", "pending", "success"}
 # 免确认收款授权状态
 _WX_AUTH_ACTIVE = "TAKING_EFFECT"   # 已生效,可免确认转账
 _WX_AUTH_CLOSED = "CLOSED"          # 已关闭(用户/商户/风控),需重新开启
@@ -379,7 +374,6 @@ def bind_wechat_openid(db: Session, user_id: int, code: str) -> dict:
     user.wechat_openid = info["openid"]
     user.wechat_nickname = info["nickname"]
     user.wechat_avatar_url = info["avatar_url"]
-    apply_wechat_display_identity(user, wechat_nickname=info["nickname"], wechat_avatar_url=info["avatar_url"])
     db.commit()
     return info
 
@@ -628,10 +622,9 @@ def _beijing_today_start_utc() -> datetime:
 def withdraw_tier_states(db: Session, user_id: int, source: str = "coin_cash") -> list[dict]:
     """福利页(coin_cash)提现档位的可提现状态。withdraw-info 下发与 create_withdraw 校验共用此口径。
 
-    规则(2026-07-09 拍板,7-9提现ui对齐;新人档判定 2026-07-16 修正):
-      - 新人档(0.1/0.3):账号历史一次性——进行中(reviewing/pending)或成功打款(success)即视为
-        已用,直接**从返回列表消失**;被拒/转账失败/解绑退回(均已退款、钱没到手)则恢复可提,不永久
-        占用资格。两档各自独立互不影响,不参与"每日选一个额度"互斥。
+    规则(2026-07-09 拍板,7-9提现ui对齐):
+      - 新人档(0.1/0.3):账号历史一次性——只要发起过(**任意状态**,含被拒/失败,"发起就算")
+        即视为已用,直接**从返回列表消失**;两档各自独立互不影响,不参与"每日选一个额度"互斥。
       - 常规档(0.5×3 / 10×1 / 20×1):按北京日计次,"发起就算占用"(当天创建的单不论最终状态
         都计入,被拒/失败不退当天名额);三档每天只能选一个,选定后其余两档当天 other_tier_selected。
       - invite_cash 本轮无档位概念 → 返回空列表(邀请页客户端仍用本地写死档位,行为不变)。
@@ -642,7 +635,7 @@ def withdraw_tier_states(db: Session, user_id: int, source: str = "coin_cash") -
     tiers = rewards.WITHDRAW_TIERS_COIN_CASH
     amounts = [t.amount_cents for t in tiers]
     newbie_amounts = [t.amount_cents for t in tiers if t.is_newbie]
-    # 新人档历史是否用过:进行中或已成功打款的单占用资格;被拒/失败/解绑退回(已退款)不算(恢复可提)
+    # 新人档历史是否用过:任意时间、任意状态("发起就算")
     used_newbie: set[int] = set(
         db.execute(
             select(WithdrawOrder.amount_cents)
@@ -651,7 +644,6 @@ def withdraw_tier_states(db: Session, user_id: int, source: str = "coin_cash") -
                 WithdrawOrder.user_id == user_id,
                 WithdrawOrder.source == "coin_cash",
                 WithdrawOrder.amount_cents.in_(newbie_amounts),
-                WithdrawOrder.status.in_(_NEWBIE_TIER_HELD_STATUSES),
             )
         ).scalars()
     ) if newbie_amounts else set()

app/schemas/auth.py

@@ -102,64 +102,3 @@ class RefreshRequest(BaseModel):
 
 class LogoutResponse(BaseModel):
     ok: bool = True
-
-
-# ===== 微信登录 =====
-
-class WechatLoginRequest(BaseModel):
-    code: str = Field(..., min_length=1, description="微信 App 授权拿到的 code(单次有效)")
-    device_id: str = Field(
-        "", max_length=64,
-        description="硬件级设备标识(Android ANDROID_ID),用于新手引导按 设备+账号 去重;空=按未完成处理",
-    )
-
-
-class WechatLoginResponse(BaseModel):
-    # status="logged_in" → openid 命中,token 有值;"need_bind_phone" → 未命中,bind_ticket 有值
-    status: str
-    token: TokenWithUser | None = None
-    bind_ticket: str | None = None
-    wechat_nickname: str | None = None
-    wechat_avatar_url: str | None = None
-
-
-class OccupiedAccountInfo(BaseModel):
-    """手机号被占用时返回的原账号脱敏展示信息(供冲突页)。"""
-    nickname: str | None = None
-    avatar_url: str | None = None
-    created_at: datetime
-    has_wechat: bool = False
-
-
-class WechatBindResultResponse(BaseModel):
-    # status="logged_in" → 未占用,已建号登入,token 有值;
-    # "phone_occupied" → 手机号被占用,occupied_account + conflict_ticket 有值,token 为 None
-    status: str
-    token: TokenWithUser | None = None
-    occupied_account: OccupiedAccountInfo | None = None
-    conflict_ticket: str | None = None            # 占用时签发,换绑/继续绑定只认它
-    rebind_available: bool | None = None          # 该手机号 30 天内是否还能换绑(给换绑按钮预置禁用态)
-    rebind_blocked_days: int | None = None        # 被限时剩余天数(rebind_available=False 时>0)
-
-
-class WechatBindPhoneSmsRequest(BaseModel):
-    bind_ticket: str = Field(..., min_length=1)
-    phone: str = Field(..., min_length=11, max_length=11, pattern=r"^1\d{10}$")
-    code: str = Field(..., min_length=4, max_length=8)
-    device_id: str = Field("", max_length=64)
-
-
-class WechatBindPhoneJverifyRequest(BaseModel):
-    bind_ticket: str = Field(..., min_length=1)
-    login_token: str = Field(..., min_length=1, description="客户端 loginAuth 拿到的 loginToken")
-    device_id: str = Field("", max_length=64)
-
-
-class WechatConflictContinueRequest(BaseModel):
-    conflict_ticket: str = Field(..., min_length=1)
-    device_id: str = Field("", max_length=64)
-
-
-class WechatConflictRebindRequest(BaseModel):
-    conflict_ticket: str = Field(..., min_length=1)
-    device_id: str = Field("", max_length=64)

app/schemas/device.py

@@ -9,6 +9,7 @@ from pydantic import BaseModel, ConfigDict
 class DeviceRegisterRequest(BaseModel):
     device_id: str
     registration_id: str | None = None
+    oppo_register_id: str | None = None
     platform: str = "android"
     app_version: str | None = None
 
@@ -18,6 +19,7 @@ class HeartbeatRequest(BaseModel):
     source: str = "service"          # service | app
     accessibility_enabled: bool = True
     registration_id: str | None = None
+    oppo_register_id: str | None = None
 
 
 class DeviceOut(BaseModel):
@@ -26,6 +28,7 @@ class DeviceOut(BaseModel):
     id: int
     device_id: str
     registration_id: str | None
+    oppo_register_id: str | None
     ever_protected: bool
     liveness_state: str
     last_heartbeat_at: datetime | None

app/services/push_notify.py

@@ -0,0 +1,74 @@
+"""推送通知编排(查设备 push token → 调厂商推送)。
+
+薄编排层: repositories(取 token) + integrations(发送) 的粘合, 供 api / admin router 调用。
+所有发送 best-effort —— 失败只 log, 绝不抛给调用方(不连累审核/打款等主流程)。
+
+当前只有 OPPO 直连一条通道(提现审核通过通知)。后续加华为/vivo 等厂商时, 在这里按设备
+token 做通道分发, 上层业务函数(notify_withdraw_approved 等)不感知通道差异。
+"""
+from __future__ import annotations
+
+import logging
+import threading
+
+from sqlalchemy.orm import Session
+
+from app.db.session import SessionLocal
+from app.integrations import oppo_push
+from app.integrations.oppo_push import OppoPushError
+from app.repositories import device as device_repo
+
+logger = logging.getLogger("shagua.push_notify")
+
+_WITHDRAW_APPROVED_TITLE = "提现审核通过"
+_WITHDRAW_APPROVED_CONTENT = "您的提现申请已审核通过，款项将很快到账，请留意微信零钱。"
+
+
+def notify_withdraw_approved(db: Session, *, user_id: int) -> int:
+    """提现审核通过 → 给该用户所有 OPPO 设备各推一条通知。返回成功推送的设备数。
+
+    best-effort: 未配 OPPO / 无 OPPO 设备 / 单设备发送失败都不抛, 只 log。审核主流程绝不受影响。
+    调用方仍应包一层 try/except 兜底本函数自身的意外异常(如 DB 查询失败)。
+    """
+    reg_ids = device_repo.list_oppo_register_ids_by_user(db, user_id=user_id)
+    if not reg_ids:
+        logger.info("[push] withdraw_approved user_id=%s 无 OPPO 设备, 跳过", user_id)
+        return 0
+
+    sent = 0
+    for rid in reg_ids:
+        try:
+            oppo_push.send_notification(
+                rid, _WITHDRAW_APPROVED_TITLE, _WITHDRAW_APPROVED_CONTENT
+            )
+            sent += 1
+        except OppoPushError as e:
+            logger.warning(
+                "[push] withdraw_approved user_id=%s regId=%s… 发送失败: %s",
+                user_id, rid[:12], e,
+            )
+    logger.info(
+        "[push] withdraw_approved user_id=%s 推送 %d/%d 台 OPPO 设备",
+        user_id, sent, len(reg_ids),
+    )
+    return sent
+
+
+def notify_withdraw_approved_async(user_id: int) -> None:
+    """fire-and-forget 版: 后台守护线程新开 session 发推送, 不阻塞审核响应(对齐 best-effort)。
+
+    审核 approve 已同步调微信转账, 推送不该再把外部 API 耗时叠进响应(多设备/OPPO 慢时最坏
+    N×timeout)。线程内必须新开 SessionLocal —— 请求级 session 在响应返回后即关, 不能跨线程用。
+    起线程失败也只 log, 绝不连累审核。
+    """
+    def _run() -> None:
+        try:
+            with SessionLocal() as db:
+                notify_withdraw_approved(db, user_id=user_id)
+        except Exception:  # noqa: BLE001 - 后台线程绝不抛
+            logger.warning("[push] withdraw_approved async 异常 user_id=%s", user_id, exc_info=True)
+
+    try:
+        threading.Thread(target=_run, name=f"oppo-push-{user_id}", daemon=True).start()
+    except Exception:  # noqa: BLE001 - 起线程失败也绝不连累审核
+        logger.warning("[push] withdraw_approved async 起线程失败 user_id=%s", user_id, exc_info=True)

tests/test_admin_write.py

@@ -476,3 +476,81 @@ def test_withdraw_reconcile(admin_client: TestClient, finance_token: str, monkey
     )
     assert r.status_code == 200, r.text
     assert "checked" in r.json() and "resolved" in r.json()
+
+
+# ===== 提现审核通过 → OPPO 推送挂钩 =====
+
+def test_approve_triggers_oppo_push(
+    admin_client: TestClient, finance_token: str, monkeypatch
+) -> None:
+    """审核通过(非 failed)后触发一次 OPPO 推送, 带被审核单的 user_id。"""
+    uid = _seed_user("13900000021")
+    db = SessionLocal()
+    try:
+        db.add(WithdrawOrder(
+            user_id=uid, out_bill_no="pushapprove0001", amount_cents=100, status="reviewing"
+        ))
+        db.commit()
+    finally:
+        db.close()
+
+    from app.admin.routers import withdraw as withdraw_router
+
+    # 绕过真实微信转账: approve 直接把单置 pending 返回(不发 wxpay)
+    def _fake_approve(db, obn):
+        o = db.execute(
+            select(WithdrawOrder).where(WithdrawOrder.out_bill_no == obn)
+        ).scalar_one()
+        o.status = "pending"
+        db.commit()
+        return o
+
+    monkeypatch.setattr(withdraw_router.wallet_repo, "approve_withdraw", _fake_approve)
+    pushed: list[int] = []
+    monkeypatch.setattr(
+        withdraw_router.push_notify, "notify_withdraw_approved_async",
+        lambda user_id: pushed.append(user_id),
+    )
+    r = admin_client.post(
+        "/admin/api/withdraws/pushapprove0001/approve", headers=_auth(finance_token)
+    )
+    assert r.status_code == 200, r.text
+    assert pushed == [uid]
+
+
+def test_approve_failed_does_not_push(
+    admin_client: TestClient, finance_token: str, monkeypatch
+) -> None:
+    """打款直接失败(status=failed, 已退款)不推"审核通过"。"""
+    uid = _seed_user("13900000022")
+    db = SessionLocal()
+    try:
+        db.add(WithdrawOrder(
+            user_id=uid, out_bill_no="pushapprove0002", amount_cents=100, status="reviewing"
+        ))
+        db.commit()
+    finally:
+        db.close()
+
+    from app.admin.routers import withdraw as withdraw_router
+
+    def _fake_approve_failed(db, obn):
+        o = db.execute(
+            select(WithdrawOrder).where(WithdrawOrder.out_bill_no == obn)
+        ).scalar_one()
+        o.status = "failed"
+        o.fail_reason = "余额不足"
+        db.commit()
+        return o
+
+    monkeypatch.setattr(withdraw_router.wallet_repo, "approve_withdraw", _fake_approve_failed)
+    pushed: list[int] = []
+    monkeypatch.setattr(
+        withdraw_router.push_notify, "notify_withdraw_approved_async",
+        lambda user_id: pushed.append(user_id),
+    )
+    r = admin_client.post(
+        "/admin/api/withdraws/pushapprove0002/approve", headers=_auth(finance_token)
+    )
+    assert r.status_code == 200, r.text
+    assert pushed == []

tests/test_auth.py

@@ -107,67 +107,6 @@ def test_sms_send_device_ip_rate_limit(client, monkeypatch) -> None:
     assert r.status_code == 200, r.text
 
 
-def test_sms_send_cooldown_reject_not_counted(client, monkeypatch) -> None:
-    """发码额度只算「成功发码」:被单号 60s 冷却挡下的重发(429)不占设备额度。
-    做法:同号狂发只成功 1 次、其余被冷却挡下;把小时额度设 2,证明换号后仍能再成功发 1 次
-    —— 若冷却重发也计数,额度早被那几次耗尽。"""
-    from app.api.v1 import auth
-    from app.core import ratelimit
-
-    monkeypatch.setattr(ratelimit.settings, "RATE_LIMIT_ENABLED", True)
-    monkeypatch.setattr(auth, "SMS_SEND_MAX_PER_HOUR_PER_DEVICE", 2)
-    ratelimit._buckets.clear()
-
-    device = "dev-cooldown"
-    phone_a = "13710137000"
-    # 首发成功(小时闸计 1/2)
-    assert client.post(
-        "/api/v1/auth/sms/send", json={"phone": phone_a, "device_id": device}
-    ).status_code == 200
-    # 同号连发 3 次:都被单号 60s 冷却挡下 → 429,且**不占**设备额度
-    for _ in range(3):
-        r = client.post(
-            "/api/v1/auth/sms/send", json={"phone": phone_a, "device_id": device}
-        )
-        assert r.status_code == 429, r.text
-    # 换号再发:设备额度只用了 1/2(冷却那几次没算)→ 仍放行(计到 2/2)
-    assert client.post(
-        "/api/v1/auth/sms/send", json={"phone": "13710137001", "device_id": device}
-    ).status_code == 200
-    # 又换号:此时小时闸已 2/2 → 429(反证成功发码确实各计了 1)
-    r = client.post(
-        "/api/v1/auth/sms/send", json={"phone": "13710137002", "device_id": device}
-    )
-    assert r.status_code == 429, r.text
-
-
-def test_sms_send_daily_cap(client, monkeypatch) -> None:
-    """每天发码上限(设备 + IP):成功发码累计到日上限即 429(用不同手机号绕开单号冷却)。
-    抬高小时闸单独测日闸;超限文案含「今日」以便前端提示明天再来。"""
-    from app.api.v1 import auth
-    from app.core import ratelimit
-
-    monkeypatch.setattr(ratelimit.settings, "RATE_LIMIT_ENABLED", True)
-    monkeypatch.setattr(auth, "SMS_SEND_MAX_PER_HOUR_PER_DEVICE", 100)  # 抬高小时闸,不干扰
-    monkeypatch.setattr(auth, "SMS_SEND_MAX_PER_DAY_PER_DEVICE", 3)
-    ratelimit._buckets.clear()
-
-    device = "dev-daily"
-    for i in range(3):
-        r = client.post(
-            "/api/v1/auth/sms/send",
-            json={"phone": f"13720137{i:03d}", "device_id": device},
-        )
-        assert r.status_code == 200, f"第 {i + 1} 次应放行: {r.text}"
-    # 第 4 次:同设备同 IP 当日超限 → 429
-    r = client.post(
-        "/api/v1/auth/sms/send",
-        json={"phone": "13720137999", "device_id": device},
-    )
-    assert r.status_code == 429, r.text
-    assert "今日" in r.json()["detail"]
-
-
 def test_sms_login_device_ip_rate_limit(client, monkeypatch) -> None:
     """防刷:同一设备(device_id) + 同一 IP 每小时最多 SMS_LOGIN_MAX_PER_HOUR 次登录尝试,超出 429。
     conftest 默认 RATE_LIMIT_ENABLED=false(内存计数跨用例累加),本用例临时打开并清空计数隔离。"""

tests/test_oppo_push.py

@@ -0,0 +1,101 @@
+"""oppo_push 集成层单测:未配降级 / auth+unicast 正常流程 / token 缓存 / OPPO 错误码抛错。
+
+httpx 全 monkeypatch, 不发真实网络。
+"""
+from __future__ import annotations
+
+import json
+
+import pytest
+
+from app.integrations import oppo_push
+from app.integrations.oppo_push import OppoPushError
+
+
+class _FakeResp:
+    def __init__(self, status_code: int, payload: dict) -> None:
+        self.status_code = status_code
+        self._payload = payload
+        self.text = json.dumps(payload)
+
+    def json(self) -> dict:
+        return self._payload
+
+
+def _configure(monkeypatch) -> None:
+    """配齐凭证 + 清 token 缓存(避免跨用例污染)。"""
+    monkeypatch.setattr(oppo_push.settings, "OPPO_PUSH_ENABLED", True)
+    monkeypatch.setattr(oppo_push.settings, "OPPO_PUSH_APP_KEY", "ak")
+    monkeypatch.setattr(oppo_push.settings, "OPPO_PUSH_MASTER_SECRET", "ms")
+    oppo_push._token_cache = None
+
+
+def test_not_configured_raises(monkeypatch) -> None:
+    monkeypatch.setattr(oppo_push.settings, "OPPO_PUSH_APP_KEY", "")
+    monkeypatch.setattr(oppo_push.settings, "OPPO_PUSH_MASTER_SECRET", "")
+    oppo_push._token_cache = None
+    with pytest.raises(OppoPushError):
+        oppo_push.send_notification("regid", "t", "c")
+
+
+def test_disabled_raises(monkeypatch) -> None:
+    _configure(monkeypatch)
+    monkeypatch.setattr(oppo_push.settings, "OPPO_PUSH_ENABLED", False)
+    with pytest.raises(OppoPushError):
+        oppo_push.send_notification("regid", "t", "c")
+
+
+def test_success_flow(monkeypatch) -> None:
+    _configure(monkeypatch)
+    calls: list[tuple] = []
+
+    def _fake_post(url, **kw):
+        calls.append((url, kw))
+        if url == oppo_push.settings.OPPO_PUSH_AUTH_ENDPOINT:
+            return _FakeResp(200, {"code": 0, "message": "success", "data": {"auth_token": "TOK"}})
+        return _FakeResp(200, {"code": 0, "message": "success", "data": {"message_id": "MID"}})
+
+    monkeypatch.setattr(oppo_push.httpx, "post", _fake_post)
+    mid = oppo_push.send_notification("regid123", "标题", "内容")
+    assert mid == "MID"
+    # 先 auth 再 unicast, unicast header 带 auth_token
+    assert calls[0][0] == oppo_push.settings.OPPO_PUSH_AUTH_ENDPOINT
+    assert calls[1][0] == oppo_push.settings.OPPO_PUSH_UNICAST_ENDPOINT
+    assert calls[1][1]["headers"]["auth_token"] == "TOK"
+    # unicast body 的 message 是 JSON 字符串, 含 target_value / notification
+    msg = json.loads(calls[1][1]["data"]["message"])
+    assert msg["target_value"] == "regid123"
+    assert msg["notification"]["title"] == "标题"
+    assert msg["notification"]["content"] == "内容"
+    # channel_id 必带(默认 shagua_wallet); category 默认空 → 不带
+    assert msg["notification"]["channel_id"] == "push_oplus_category_content"
+    assert "category" not in msg["notification"]
+
+
+def test_auth_token_cached(monkeypatch) -> None:
+    _configure(monkeypatch)
+    auth_hits: list[int] = []
+
+    def _fake_post(url, **kw):
+        if url == oppo_push.settings.OPPO_PUSH_AUTH_ENDPOINT:
+            auth_hits.append(1)
+            return _FakeResp(200, {"code": 0, "data": {"auth_token": "TOK"}})
+        return _FakeResp(200, {"code": 0, "data": {"message_id": "MID"}})
+
+    monkeypatch.setattr(oppo_push.httpx, "post", _fake_post)
+    oppo_push.send_notification("r", "t", "c")
+    oppo_push.send_notification("r", "t", "c")
+    assert len(auth_hits) == 1  # 第二次复用缓存 token, 不再换 auth
+
+
+def test_oppo_error_raises(monkeypatch) -> None:
+    _configure(monkeypatch)
+
+    def _fake_post(url, **kw):
+        if url == oppo_push.settings.OPPO_PUSH_AUTH_ENDPOINT:
+            return _FakeResp(200, {"code": 0, "data": {"auth_token": "TOK"}})
+        return _FakeResp(200, {"code": -2, "message": "invalid target"})
+
+    monkeypatch.setattr(oppo_push.httpx, "post", _fake_post)
+    with pytest.raises(OppoPushError):
+        oppo_push.send_notification("r", "t", "c")

tests/test_push_notify.py

@@ -0,0 +1,70 @@
+"""push_notify.notify_withdraw_approved 单测:多 OPPO 设备全推 / 无设备返 0 / 发送失败吞错。"""
+from __future__ import annotations
+
+from app.db.session import SessionLocal
+from app.integrations.oppo_push import OppoPushError
+from app.repositories import device as device_repo
+from app.repositories import user as user_repo
+from app.services import push_notify
+
+
+def _seed_user(phone: str) -> int:
+    db = SessionLocal()
+    try:
+        return user_repo.upsert_user_for_login(db, phone=phone, register_channel="sms").id
+    finally:
+        db.close()
+
+
+def _add_oppo_device(user_id: int, device_id: str, oppo_reg: str) -> None:
+    db = SessionLocal()
+    try:
+        device_repo.register_or_update(
+            db, user_id=user_id, device_id=device_id,
+            registration_id=None, oppo_register_id=oppo_reg,
+        )
+    finally:
+        db.close()
+
+
+def test_notify_no_oppo_device_returns_zero() -> None:
+    uid = _seed_user("13911100001")
+    db = SessionLocal()
+    try:
+        assert push_notify.notify_withdraw_approved(db, user_id=uid) == 0
+    finally:
+        db.close()
+
+
+def test_notify_pushes_all_oppo_devices(monkeypatch) -> None:
+    uid = _seed_user("13911100002")
+    _add_oppo_device(uid, "dev_a", "OPPO_REG_A")
+    _add_oppo_device(uid, "dev_b", "OPPO_REG_B")
+    sent: list[str] = []
+    monkeypatch.setattr(
+        push_notify.oppo_push, "send_notification",
+        lambda rid, title, content, **kw: sent.append(rid) or "msgid",
+    )
+    db = SessionLocal()
+    try:
+        n = push_notify.notify_withdraw_approved(db, user_id=uid)
+    finally:
+        db.close()
+    assert n == 2
+    assert set(sent) == {"OPPO_REG_A", "OPPO_REG_B"}
+
+
+def test_notify_swallows_send_error(monkeypatch) -> None:
+    uid = _seed_user("13911100003")
+    _add_oppo_device(uid, "dev_c", "OPPO_REG_C")
+
+    def _boom(rid, title, content, **kw):
+        raise OppoPushError("simulated failure")
+
+    monkeypatch.setattr(push_notify.oppo_push, "send_notification", _boom)
+    db = SessionLocal()
+    try:
+        # 发送失败被吞, 不抛; 成功数为 0
+        assert push_notify.notify_withdraw_approved(db, user_id=uid) == 0
+    finally:
+        db.close()

tests/test_ratelimit.py

@@ -1,57 +0,0 @@
-"""ratelimit 内存桶过期清理(GC)测试。
-
-回归重点:_buckets 是**全局共享**、混着不同窗口(60s 广告 / 3600s 登录 / 86400s 日闸)的 key。
-GC 必须按【每个 key 自己存的 window_sec】判过期,而不是当前调用方的窗口 —— 否则高频的 60s 端点
-触发 GC 时会把本该存活更久的 3600s/86400s 计数(如短信日闸)一并删掉,使其被反复清零、限流失效。
-用 monkeypatch 把 _GC_THRESHOLD 调 0 强制每次都扫,免造上万条(仿 test_auth 里对 sms._GC_THRESHOLD 的做法)。
-"""
-from __future__ import annotations
-
-from app.core import ratelimit
-
-
-def test_purge_expired_respects_each_key_own_window(monkeypatch) -> None:
-    """短窗口(60s)触发的 GC 只删真正过期的 key,不得删掉仍在自身窗口内的长窗口 key。"""
-    monkeypatch.setattr(ratelimit, "_GC_THRESHOLD", 0)  # 强制每次都扫
-    ratelimit._buckets.clear()
-
-    now = 1_000_000.0
-    # 日闸:100s 前开窗、window=86400 → 远未过期,必须保留
-    ratelimit._buckets["sms-send-device-daily:D:IP"] = (now - 100, 7, 86400.0)
-    # 登录:1800s、window=3600 → 未过期,保留
-    ratelimit._buckets["sms-login-device:D:IP"] = (now - 1800, 2, 3600.0)
-    # 广告:120s、window=60 → 已过期,应删
-    ratelimit._buckets["ad-watch-report:IP2"] = (now - 120, 3, 60.0)
-
-    ratelimit._purge_expired(now)
-
-    assert "sms-send-device-daily:D:IP" in ratelimit._buckets
-    assert "sms-login-device:D:IP" in ratelimit._buckets
-    assert "ad-watch-report:IP2" not in ratelimit._buckets
-
-
-def test_purge_expired_keeps_long_window_key_older_than_short_window(monkeypatch) -> None:
-    """反证旧 bug:日闸 key 已老于 3600s,旧代码在 60s/3600s 端点触发 GC 时会误删它;
-    现在按自身 86400s 窗口判 → 未过期 → 必须保留。"""
-    monkeypatch.setattr(ratelimit, "_GC_THRESHOLD", 0)
-    ratelimit._buckets.clear()
-
-    now = 2_000_000.0
-    # 3700s 前开窗(> 1 小时),但 window=86400 → 未过期
-    ratelimit._buckets["sms-send-device-daily:D:IP"] = (now - 3700, 20, 86400.0)
-
-    ratelimit._purge_expired(now)
-
-    assert "sms-send-device-daily:D:IP" in ratelimit._buckets
-
-
-def test_purge_expired_noop_below_threshold(monkeypatch) -> None:
-    """未超阈值时不扫(即便有过期 key 也不动),避免每次请求都 O(n) 扫全表。"""
-    monkeypatch.setattr(ratelimit, "_GC_THRESHOLD", 10)
-    ratelimit._buckets.clear()
-
-    now = 3_000_000.0
-    ratelimit._buckets["stale:IP"] = (now - 999, 1, 60.0)  # 早过期,但没超阈值
-    ratelimit._purge_expired(now)
-
-    assert "stale:IP" in ratelimit._buckets  # 桶数没超阈值 → 不清理

tests/test_wechat_conflict.py

@@ -1,232 +0,0 @@
-"""微信登录 M2 测试:conflict_ticket 令牌、继续绑定(attach/只登入)、换绑(建号+软删+30天限)。
-
-沿用 tests/test_wechat_login.py 风格:HTTP 走 client;微信 code→openid 用 monkeypatch;
-短信走 SMS_MOCK(任意 6 位过)。数据变更用"再走一遍 wechat-login 看 openid 落在哪个账号"做行为断言。
-"""
-from __future__ import annotations
-
-import pytest
-
-from app.api.v1 import auth  # noqa: F401  (后续测试打桩 verify_and_get_phone 用)
-from app.core import security
-from app.integrations import wxpay
-from app.models.phone_rebind_log import PhoneRebindLog
-
-
-def _fake_userinfo(openid: str, nickname: str | None = "微信昵称", avatar: str | None = "http://x/a.png"):
-    def _f(code: str) -> dict:
-        return {"openid": openid, "nickname": nickname, "avatar_url": avatar, "raw": {}}
-    return _f
-
-
-def _sms_occupy(client, phone: str) -> int:
-    """用普通短信登录占用一个手机号(register_channel=sms),返回该账号 id。"""
-    assert client.post("/api/v1/auth/sms/send", json={"phone": phone}).status_code == 200
-    r = client.post("/api/v1/auth/sms/login", json={"phone": phone, "code": "123456"})
-    assert r.status_code == 200, r.text
-    return r.json()["user"]["id"]
-
-
-def _occupy_via_conflict(client, monkeypatch, openid: str, phone: str, device_id: str) -> dict:
-    """微信登录(新 openid)→ 绑同一手机号 → 返回 phone_occupied 的响应体(含 conflict_ticket)。"""
-    monkeypatch.setattr(wxpay, "code_to_userinfo", _fake_userinfo(openid))
-    ticket = client.post(
-        "/api/v1/auth/wechat-login", json={"code": "c", "device_id": device_id}
-    ).json()["bind_ticket"]
-    r = client.post(
-        "/api/v1/auth/wechat/bind-phone/sms",
-        json={"bind_ticket": ticket, "phone": phone, "code": "123456", "device_id": device_id},
-    )
-    assert r.status_code == 200, r.text
-    body = r.json()
-    assert body["status"] == "phone_occupied"
-    return body
-
-
-# ===== Task 1: 模型可导入(建表由 conftest 的 create_all 完成) =====
-
-def test_phone_rebind_log_model_importable() -> None:
-    assert PhoneRebindLog.__tablename__ == "phone_rebind_log"
-
-
-# ===== Task 2: conflict_ticket 令牌 =====
-
-def test_conflict_ticket_roundtrip() -> None:
-    token = security.create_conflict_ticket(
-        openid="oid1", wechat_nickname="昵", wechat_avatar_url="http://a", phone="13900139000"
-    )
-    claims = security.decode_conflict_ticket(token)
-    assert claims["openid"] == "oid1"
-    assert claims["wnk"] == "昵"
-    assert claims["wav"] == "http://a"
-    assert claims["phone"] == "13900139000"
-
-
-def test_conflict_ticket_wrong_type_rejected() -> None:
-    # bind_ticket 冒充 conflict_ticket → TokenError(typ 不匹配)
-    bind = security.create_bind_ticket(openid="oid", wechat_nickname=None, wechat_avatar_url=None)
-    with pytest.raises(security.TokenError):
-        security.decode_conflict_ticket(bind)
-
-
-def test_conflict_ticket_expired_rejected(monkeypatch) -> None:
-    monkeypatch.setattr(security.settings, "WECHAT_BIND_TICKET_EXPIRE_MINUTES", -1)
-    token = security.create_conflict_ticket(
-        openid="oid", wechat_nickname=None, wechat_avatar_url=None, phone="13900139000"
-    )
-    with pytest.raises(security.TokenError):
-        security.decode_conflict_ticket(token)
-
-
-# ===== Task 3: 占用响应扩展 =====
-
-def test_phone_occupied_returns_conflict_ticket_and_flags(client, monkeypatch) -> None:
-    phone = "13900139101"
-    _sms_occupy(client, phone)  # 老账号 X(sms,无微信)
-    body = _occupy_via_conflict(client, monkeypatch, "openid_occ_101", phone, "devO1")
-    assert body["conflict_ticket"]
-    assert body["rebind_available"] is True      # 首次,未换绑过
-    assert body["rebind_blocked_days"] == 0
-    assert body["occupied_account"]["has_wechat"] is False  # X 是 sms 账号
-
-
-# ===== Task 4: 继续绑定 =====
-
-def test_continue_attaches_wechat_and_logs_into_existing(client, monkeypatch) -> None:
-    """X 无微信 → 继续绑定并入 openid + 登入 X;之后同 openid 登录直接命中 X。"""
-    phone = "13900139201"
-    x_id = _sms_occupy(client, phone)  # X:sms 账号,无微信
-    body = _occupy_via_conflict(client, monkeypatch, "openid_cont_201", phone, "devC1")
-
-    r = client.post(
-        "/api/v1/auth/wechat/conflict/continue",
-        json={"conflict_ticket": body["conflict_ticket"], "device_id": "devC1"},
-    )
-    assert r.status_code == 200, r.text
-    assert r.json()["status"] == "logged_in"
-    assert r.json()["token"]["user"]["id"] == x_id  # 登入的是老账号 X
-
-    # openid 现已并入 X:再走 wechat-login 直接命中 X
-    r = client.post("/api/v1/auth/wechat-login", json={"code": "c", "device_id": "devC1"})
-    assert r.json()["status"] == "logged_in"
-    assert r.json()["token"]["user"]["id"] == x_id
-
-
-def test_continue_when_existing_has_wechat_logs_in_and_discards_openid(client, monkeypatch) -> None:
-    """X 已绑别的微信 → 继续绑定只登入 X、丢弃本次 openid(不覆盖)。"""
-    phone = "13900139202"
-    # 先建一个已绑微信 O1 的账号 X(微信登录 O1 + 短信绑号)
-    monkeypatch.setattr(wxpay, "code_to_userinfo", _fake_userinfo("openid_o1_202"))
-    t = client.post("/api/v1/auth/wechat-login", json={"code": "c", "device_id": "devC2"}).json()["bind_ticket"]
-    x = client.post(
-        "/api/v1/auth/wechat/bind-phone/sms",
-        json={"bind_ticket": t, "phone": phone, "code": "123456", "device_id": "devC2"},
-    ).json()
-    x_id = x["token"]["user"]["id"]
-
-    # 新 openid O2 撞同号 → 占用(has_wechat=True)→ 继续绑定
-    body = _occupy_via_conflict(client, monkeypatch, "openid_o2_202", phone, "devC2b")
-    assert body["occupied_account"]["has_wechat"] is True
-    r = client.post(
-        "/api/v1/auth/wechat/conflict/continue",
-        json={"conflict_ticket": body["conflict_ticket"], "device_id": "devC2b"},
-    )
-    assert r.status_code == 200, r.text
-    assert r.json()["token"]["user"]["id"] == x_id  # 登入 X
-
-    # O2 被丢弃:再走 wechat-login(O2)→ 仍未命中(need_bind_phone)
-    monkeypatch.setattr(wxpay, "code_to_userinfo", _fake_userinfo("openid_o2_202"))
-    assert client.post(
-        "/api/v1/auth/wechat-login", json={"code": "c", "device_id": "devC2b"}
-    ).json()["status"] == "need_bind_phone"
-
-
-def test_continue_expired_ticket_returns_401(client, monkeypatch) -> None:
-    monkeypatch.setattr(security.settings, "WECHAT_BIND_TICKET_EXPIRE_MINUTES", -1)
-    expired = security.create_conflict_ticket(
-        openid="oid", wechat_nickname=None, wechat_avatar_url=None, phone="13900139209"
-    )
-    r = client.post(
-        "/api/v1/auth/wechat/conflict/continue",
-        json={"conflict_ticket": expired, "device_id": "devC3"},
-    )
-    assert r.status_code == 401, r.text
-
-
-# ===== Task 5: 换绑 =====
-
-def test_rebind_creates_new_account_and_binds_openid(client, monkeypatch) -> None:
-    """换绑 → 建全新微信账号 Y(≠X)+ openid 落到 Y;老账号 X 被注销(手机号归 Y)。"""
-    phone = "13900139301"
-    x_id = _sms_occupy(client, phone)
-    body = _occupy_via_conflict(client, monkeypatch, "openid_rb_301", phone, "devR1")
-
-    r = client.post(
-        "/api/v1/auth/wechat/conflict/rebind",
-        json={"conflict_ticket": body["conflict_ticket"], "device_id": "devR1"},
-    )
-    assert r.status_code == 200, r.text
-    y = r.json()["token"]["user"]
-    assert r.json()["status"] == "logged_in"
-    assert y["phone"] == phone
-    assert y["register_channel"] == "wechat"
-    assert y["id"] != x_id  # 是全新账号,不是老账号
-
-    # openid 落到 Y:再走 wechat-login 命中 Y
-    r = client.post("/api/v1/auth/wechat-login", json={"code": "c", "device_id": "devR1"})
-    assert r.json()["status"] == "logged_in"
-    assert r.json()["token"]["user"]["id"] == y["id"]
-
-
-# ===== §10: continue 路径也应用展示身份回填规则 =====
-
-def test_continue_applies_section10(client, monkeypatch) -> None:
-    """§10 via M2 attach 路径: X 是默认昵称+null头像的 sms 账号;
-    continue 绑定微信后,展示昵称/头像应被微信值替换,并体现在响应的 token.user 中。"""
-    phone = "13900139211"
-    _sms_occupy(client, phone)  # 建 X:默认昵称, null avatar
-    body = _occupy_via_conflict(
-        client, monkeypatch, "openid_s10", phone, "devS10"
-    )  # fake_userinfo 默认 nickname="微信昵称", avatar="http://x/a.png"
-
-    r = client.post(
-        "/api/v1/auth/wechat/conflict/continue",
-        json={"conflict_ticket": body["conflict_ticket"], "device_id": "devS10"},
-    )
-    assert r.status_code == 200, r.text
-    user_out = r.json()["token"]["user"]
-    assert user_out["nickname"] == "微信昵称"
-    assert user_out["avatar_url"] == "http://x/a.png"
-
-
-def test_rebind_blocked_within_30_days(client, monkeypatch) -> None:
-    """同一手机号 30 天内二次换绑 → 409;占用响应 rebind_available=False。"""
-    phone = "13900139302"
-    _sms_occupy(client, phone)
-    body = _occupy_via_conflict(client, monkeypatch, "openid_rb_302a", phone, "devR2")
-    assert client.post(
-        "/api/v1/auth/wechat/conflict/rebind",
-        json={"conflict_ticket": body["conflict_ticket"], "device_id": "devR2"},
-    ).status_code == 200
-
-    # 第二次:新 openid 撞同号 → 占用响应此时 rebind_available=False
-    body2 = _occupy_via_conflict(client, monkeypatch, "openid_rb_302b", phone, "devR2b")
-    assert body2["rebind_available"] is False
-    assert body2["rebind_blocked_days"] >= 1
-    r = client.post(
-        "/api/v1/auth/wechat/conflict/rebind",
-        json={"conflict_ticket": body2["conflict_ticket"], "device_id": "devR2b"},
-    )
-    assert r.status_code == 409, r.text
-
-
-def test_rebind_expired_ticket_returns_401(client, monkeypatch) -> None:
-    monkeypatch.setattr(security.settings, "WECHAT_BIND_TICKET_EXPIRE_MINUTES", -1)
-    expired = security.create_conflict_ticket(
-        openid="oid", wechat_nickname=None, wechat_avatar_url=None, phone="13900139309"
-    )
-    r = client.post(
-        "/api/v1/auth/wechat/conflict/rebind",
-        json={"conflict_ticket": expired, "device_id": "devR3"},
-    )
-    assert r.status_code == 401, r.text

tests/test_wechat_login.py

@@ -1,198 +0,0 @@
-"""微信登录 M1 测试:bind_ticket 令牌、wechat-login(openid 命中/未命中)、
-bind-phone(建号/占用/令牌过期)。
-
-沿用 tests/test_auth.py 风格:HTTP 走 client fixture;微信 code→openid 用 monkeypatch
-拦掉(conftest 里 WECHAT_APP_ID/SECRET 是 dummy,不真连微信);短信走 SMS_MOCK(任意 6 位通过)。
-"""
-from __future__ import annotations
-
-import pytest
-
-from app.api.v1 import auth
-from app.core import security
-from app.integrations import wxpay
-
-
-def _fake_userinfo(openid: str, nickname: str | None = "微信昵称", avatar: str | None = "http://x/a.png"):
-    """返回一个可传给 monkeypatch 的假 code_to_userinfo(忽略 code,固定返回给定 openid)。"""
-    def _f(code: str) -> dict:
-        return {"openid": openid, "nickname": nickname, "avatar_url": avatar, "raw": {}}
-    return _f
-
-
-# ===== Task 1: bind_ticket 令牌 =====
-
-def test_bind_ticket_roundtrip() -> None:
-    token = security.create_bind_ticket(openid="oid1", wechat_nickname="昵", wechat_avatar_url="http://a")
-    claims = security.decode_bind_ticket(token)
-    assert claims["openid"] == "oid1"
-    assert claims["wnk"] == "昵"
-    assert claims["wav"] == "http://a"
-
-
-def test_bind_ticket_wrong_type_rejected() -> None:
-    # 用 access token 冒充 bind_ticket → TokenError(typ 不匹配)
-    access, _ = security.create_token(user_id=1, token_type="access")
-    with pytest.raises(security.TokenError):
-        security.decode_bind_ticket(access)
-
-
-def test_bind_ticket_expired_rejected(monkeypatch) -> None:
-    monkeypatch.setattr(security.settings, "WECHAT_BIND_TICKET_EXPIRE_MINUTES", -1)
-    token = security.create_bind_ticket(openid="oid", wechat_nickname=None, wechat_avatar_url=None)
-    with pytest.raises(security.TokenError):
-        security.decode_bind_ticket(token)
-
-
-# ===== Task 2: wechat-login =====
-
-def test_wechat_login_new_openid_returns_bind_ticket(client, monkeypatch) -> None:
-    monkeypatch.setattr(wxpay, "code_to_userinfo", _fake_userinfo("openid_new_1", "小明", "http://x/m.png"))
-    r = client.post("/api/v1/auth/wechat-login", json={"code": "wxcode1", "device_id": "devA"})
-    assert r.status_code == 200, r.text
-    body = r.json()
-    assert body["status"] == "need_bind_phone"
-    assert body["bind_ticket"]
-    assert body["wechat_nickname"] == "小明"
-    assert body["wechat_avatar_url"] == "http://x/m.png"
-    assert body["token"] is None
-
-
-def test_wechat_login_invalid_code_returns_400(client, monkeypatch) -> None:
-    def _raise(code: str) -> dict:
-        raise ValueError("微信授权失败: invalid code")
-    monkeypatch.setattr(wxpay, "code_to_userinfo", _raise)
-    r = client.post("/api/v1/auth/wechat-login", json={"code": "bad", "device_id": "devA"})
-    assert r.status_code == 400, r.text
-
-
-# ===== Task 3: bind-phone/sms =====
-
-def test_wechat_bind_sms_creates_account_then_openid_logs_in(client, monkeypatch) -> None:
-    """未占用 → 建微信账号(channel=wechat,昵称头像取微信);再次同 openid 登录 → 直接登入同一账号。"""
-    monkeypatch.setattr(wxpay, "code_to_userinfo", _fake_userinfo("openid_flow_2", "阿花", "http://x/h.png"))
-    phone = "13900139002"
-
-    # 1) 微信登录 → 未命中 → 拿 ticket
-    r = client.post("/api/v1/auth/wechat-login", json={"code": "c1", "device_id": "devB"})
-    ticket = r.json()["bind_ticket"]
-    assert ticket
-
-    # 2) 短信绑号(SMS_MOCK:任意 6 位通过)→ 建号 + 登入
-    r = client.post(
-        "/api/v1/auth/wechat/bind-phone/sms",
-        json={"bind_ticket": ticket, "phone": phone, "code": "123456", "device_id": "devB"},
-    )
-    assert r.status_code == 200, r.text
-    body = r.json()
-    assert body["status"] == "logged_in"
-    user = body["token"]["user"]
-    assert user["phone"] == phone
-    assert user["register_channel"] == "wechat"
-    assert user["nickname"] == "阿花"
-    assert user["avatar_url"] == "http://x/h.png"
-    uid = user["id"]
-
-    # 3) 再次微信登录(同 openid)→ 命中 → 直接登入同一账号
-    r = client.post("/api/v1/auth/wechat-login", json={"code": "c2", "device_id": "devB"})
-    assert r.status_code == 200, r.text
-    body = r.json()
-    assert body["status"] == "logged_in"
-    assert body["token"]["user"]["id"] == uid
-
-
-def test_wechat_bind_sms_phone_occupied(client, monkeypatch) -> None:
-    """手机号已被其他账号占用 → 返回 phone_occupied + 原账号信息(不建号)。"""
-    phone = "13900139003"
-    # 先用普通短信登录占用该手机号(register_channel=sms)
-    assert client.post("/api/v1/auth/sms/send", json={"phone": phone}).status_code == 200
-    r = client.post("/api/v1/auth/sms/login", json={"phone": phone, "code": "123456"})
-    assert r.status_code == 200, r.text
-    occupied_nickname = r.json()["user"]["nickname"]
-
-    # 微信登录(新 openid)→ 未命中 → ticket
-    monkeypatch.setattr(wxpay, "code_to_userinfo", _fake_userinfo("openid_occ_3"))
-    ticket = client.post(
-        "/api/v1/auth/wechat-login", json={"code": "c", "device_id": "devC"}
-    ).json()["bind_ticket"]
-
-    # 绑同一手机号 → 占用
-    r = client.post(
-        "/api/v1/auth/wechat/bind-phone/sms",
-        json={"bind_ticket": ticket, "phone": phone, "code": "123456", "device_id": "devC"},
-    )
-    assert r.status_code == 200, r.text
-    body = r.json()
-    assert body["status"] == "phone_occupied"
-    assert body["token"] is None
-    assert body["occupied_account"]["nickname"] == occupied_nickname
-    assert body["occupied_account"]["avatar_url"] is None  # 短信注册账号无头像 → 序列化为 null
-    assert body["occupied_account"]["created_at"]
-
-
-def test_wechat_bind_sms_expired_ticket_returns_401(client, monkeypatch) -> None:
-    """过期 bind_ticket → 401。"""
-    monkeypatch.setattr(security.settings, "WECHAT_BIND_TICKET_EXPIRE_MINUTES", -1)
-    expired = security.create_bind_ticket(openid="openid_exp", wechat_nickname="x", wechat_avatar_url=None)
-    r = client.post(
-        "/api/v1/auth/wechat/bind-phone/sms",
-        json={"bind_ticket": expired, "phone": "13900139009", "code": "123456", "device_id": "devD"},
-    )
-    assert r.status_code == 401, r.text
-
-
-# ===== Task 4: bind-phone/jverify =====
-
-def test_wechat_bind_jverify_creates_account(client, monkeypatch) -> None:
-    """本机号(极光)绑定路径:verify_and_get_phone 拦掉,未占用 → 建号登入。"""
-    monkeypatch.setattr(wxpay, "code_to_userinfo", _fake_userinfo("openid_jv_5", "极光用户", None))
-    phone = "13900139005"
-    # 极光 loginToken→手机号 在 auth 模块命名空间打桩(auth.py 顶部 from ...jiguang import verify_and_get_phone)
-    monkeypatch.setattr(auth, "verify_and_get_phone", lambda token: phone)
-
-    ticket = client.post(
-        "/api/v1/auth/wechat-login", json={"code": "c", "device_id": "devE"}
-    ).json()["bind_ticket"]
-
-    r = client.post(
-        "/api/v1/auth/wechat/bind-phone/jverify",
-        json={"bind_ticket": ticket, "login_token": "jgtoken", "device_id": "devE"},
-    )
-    assert r.status_code == 200, r.text
-    body = r.json()
-    assert body["status"] == "logged_in"
-    user = body["token"]["user"]
-    assert user["phone"] == phone
-    assert user["register_channel"] == "wechat"
-    assert user["nickname"] == "极光用户"
-    # 微信 userinfo 隐私脱敏 avatar=None → 头像为空(客户端兜底默认头像)
-    assert user["avatar_url"] is None
-
-
-def test_wechat_bind_jverify_expired_ticket_returns_401(client, monkeypatch) -> None:
-    """过期 bind_ticket → 401(极光绑号路径,decode 先于极光核验)。"""
-    monkeypatch.setattr(security.settings, "WECHAT_BIND_TICKET_EXPIRE_MINUTES", -1)
-    expired = security.create_bind_ticket(openid="openid_jv_exp", wechat_nickname="x", wechat_avatar_url=None)
-    r = client.post(
-        "/api/v1/auth/wechat/bind-phone/jverify",
-        json={"bind_ticket": expired, "login_token": "jgtoken", "device_id": "devE"},
-    )
-    assert r.status_code == 401, r.text
-
-
-def test_wechat_bind_jverify_jiguang_error_returns_502(client, monkeypatch) -> None:
-    """极光核验失败(JiguangError)→ 502。"""
-    monkeypatch.setattr(wxpay, "code_to_userinfo", _fake_userinfo("openid_jv_err"))
-
-    def _raise(token: str) -> str:
-        raise auth.JiguangError("mock jg failure")
-
-    monkeypatch.setattr(auth, "verify_and_get_phone", _raise)
-    ticket = client.post(
-        "/api/v1/auth/wechat-login", json={"code": "c", "device_id": "devE"}
-    ).json()["bind_ticket"]
-    r = client.post(
-        "/api/v1/auth/wechat/bind-phone/jverify",
-        json={"bind_ticket": ticket, "login_token": "badtoken", "device_id": "devE"},
-    )
-    assert r.status_code == 502, r.text

tests/test_withdraw.py

@@ -312,94 +312,6 @@ def test_bind_rejects_openid_already_bound(client, monkeypatch) -> None:
     assert r.status_code == 409, r.text
 
 
-# ===== §10 绑微信时展示身份回填规则 =====
-
-def test_bind_replaces_default_nickname_and_null_avatar(client, monkeypatch) -> None:
-    """§10-A: 全默认(昵称=系统默认,头像=null) → 绑微信后两个展示字段都替换为微信值。"""
-    monkeypatch.setattr(
-        "app.integrations.wxpay.code_to_userinfo",
-        lambda code: {"openid": "openid_s10_a", "nickname": "微信昵称A", "avatar_url": "https://x/a.png", "raw": {}},
-    )
-    token = _login(client, "13800003001")
-    r = client.post("/api/v1/wallet/bind-wechat", json={"code": "c"}, headers=_auth(token))
-    assert r.status_code == 200, r.text
-
-    r = client.get("/api/v1/auth/me", headers=_auth(token))
-    assert r.status_code == 200, r.text
-    body = r.json()
-    assert body["nickname"] == "微信昵称A"
-    assert body["avatar_url"] == "https://x/a.png"
-
-
-def test_bind_keeps_customized_nickname(client, monkeypatch) -> None:
-    """§10-B: 用户已改过昵称 → 绑微信后昵称保留,但 null 头像仍替换为微信头像。"""
-    monkeypatch.setattr(
-        "app.integrations.wxpay.code_to_userinfo",
-        lambda code: {"openid": "openid_s10_b", "nickname": "微信昵称B", "avatar_url": "https://x/b.png", "raw": {}},
-    )
-    token = _login(client, "13800003002")
-    # 先把昵称改成非默认值
-    r = client.patch(
-        "/api/v1/user/profile", json={"nickname": "我的名字"}, headers=_auth(token)
-    )
-    assert r.status_code == 200, r.text
-
-    r = client.post("/api/v1/wallet/bind-wechat", json={"code": "c"}, headers=_auth(token))
-    assert r.status_code == 200, r.text
-
-    r = client.get("/api/v1/auth/me", headers=_auth(token))
-    body = r.json()
-    assert body["nickname"] == "我的名字"       # 保留自定义昵称
-    assert body["avatar_url"] == "https://x/b.png"  # null 头像被微信头像替换
-
-
-def test_bind_keeps_customized_avatar(client, monkeypatch) -> None:
-    """§10-C: 已有自定义头像 → 绑微信后头像保留,但默认昵称替换为微信昵称。"""
-    monkeypatch.setattr(
-        "app.integrations.wxpay.code_to_userinfo",
-        lambda code: {"openid": "openid_s10_c", "nickname": "微信昵称C", "avatar_url": "https://x/c.png", "raw": {}},
-    )
-    token = _login(client, "13800003003")
-    phone = "13800003003"
-    # 直接用 DB 给用户写入自定义头像(保持默认昵称)
-    db = SessionLocal()
-    try:
-        user = db.execute(select(User).where(User.phone == phone)).scalar_one()
-        user.avatar_url = "https://custom/av.png"
-        db.commit()
-    finally:
-        db.close()
-
-    r = client.post("/api/v1/wallet/bind-wechat", json={"code": "c"}, headers=_auth(token))
-    assert r.status_code == 200, r.text
-
-    r = client.get("/api/v1/auth/me", headers=_auth(token))
-    body = r.json()
-    assert body["nickname"] == "微信昵称C"           # 默认昵称被替换
-    assert body["avatar_url"] == "https://custom/av.png"  # 自定义头像保留
-
-
-def test_bind_wechat_empty_keeps_default(client, monkeypatch) -> None:
-    """§10-D: 微信侧 nickname/avatar 均为 None → 不覆盖,展示字段维持原默认值。"""
-    monkeypatch.setattr(
-        "app.integrations.wxpay.code_to_userinfo",
-        lambda code: {"openid": "openid_s10_d", "nickname": None, "avatar_url": None, "raw": {}},
-    )
-    token = _login(client, "13800003004")
-
-    r = client.get("/api/v1/auth/me", headers=_auth(token))
-    original_nickname = r.json()["nickname"]  # 系统分配的默认昵称
-    assert original_nickname.startswith("用户")
-
-    r = client.post("/api/v1/wallet/bind-wechat", json={"code": "c"}, headers=_auth(token))
-    assert r.status_code == 200, r.text
-
-    r = client.get("/api/v1/auth/me", headers=_auth(token))
-    body = r.json()
-    assert body["nickname"] == original_nickname  # 默认昵称不变
-    assert body["avatar_url"] is None             # 头像仍为 null
-
-
 def test_withdraw_reject_refunds(client, monkeypatch) -> None:
     """管理员审核拒绝 → 退回现金 + 单 rejected + 理由写入 fail_reason(用户可见)。"""
     monkeypatch.setattr("app.integrations.wxpay.code_to_userinfo", lambda code: {"openid": "openid_reject", "nickname": None, "avatar_url": None, "raw": {}})