feat(wallet): 连续15天无活跃账户金币+现金自动清零

新增进程内定时任务:每天北京0点后扫描,对连续无活跃满15整天(既没发起比价、
也没发起领券)的用户,清空金币与金币兑换现金;单纯登录不算活跃,邀请奖励金物理
隔离不动,每笔清零写 inactive_clear 流水可逐笔回溯。

- 活跃口径=发起比价 real_compare_start + 发起领券 real_coupon_start/claim_started
  (登录 last_login_at 不算);新用户靠 created_at 兜底(注册未满15天豁免,不会刚注册就被清)
- worker 照 daily_exchange_worker 结构:文件锁同机互斥 + 北京日切 + 启动补跑
- 只扫有余额账户,清零走 grant_coins/grant_cash 负数入账 → 天然幂等
- 循环内读实时余额 + 行锁清零防并发;days<1 钳位防误配全员清空
- 新增 INACTIVE_CLEAR_ENABLED/DAYS/CHECK_INTERVAL_SEC 三开关(默认开,15天)
- 复用现有表无需迁移

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

.env.example

@@ -32,13 +32,6 @@ 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

@@ -1,34 +0,0 @@
-"""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')

app/admin/routers/withdraw.py

@@ -37,7 +37,6 @@ 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",
@@ -316,9 +315,6 @@ 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(
@@ -442,9 +438,6 @@ 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/device.py

@@ -40,7 +40,6 @@ 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,
     )
@@ -65,7 +64,6 @@ 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

@@ -1,106 +0,0 @@
-"""微信服务号消息接收回调 /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

@@ -71,34 +71,6 @@ 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
@@ -164,12 +136,6 @@ 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)。"""
@@ -180,11 +146,6 @@ 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 一致。
@@ -208,6 +169,14 @@ class Settings(BaseSettings):
     # 进程内自动兑换 worker 的检查间隔(秒):每隔这么久醒一次,跨过北京 0 点就跑一轮。
     # 默认 600s=10min,即 0 点后最多 10 分钟内兑完(客户端文案已注明「可能存在延迟」)。
     AUTO_EXCHANGE_CHECK_INTERVAL_SEC: int = 600
+    # 连续 N 天无活跃(无比价 / 领券,登录不算)账户金币+现金清零:进程内 worker
+    # app.core.inactive_clear_worker 跨北京 0 点跑一轮 inactive_clear.clear_inactive_accounts。
+    # 邀请奖励金物理隔离,不在清空范围。⚠️ 不可逆批量资金操作,口径见 repositories/inactive_clear。
+    # 运营要临时停在 .env 置 false(worker 不启动)。
+    INACTIVE_CLEAR_ENABLED: bool = True
+    # 连续无活跃**满这么多整天之后**才清:15 → 最后活跃在 15 天前当天仍保留,第 16 天起清。
+    INACTIVE_CLEAR_DAYS: int = 15
+    INACTIVE_CLEAR_CHECK_INTERVAL_SEC: int = 600
     # 免确认收款授权(用户授权免确认模式)的授权结果回调地址,必须公网可访问 HTTPS、不带参数。
     # 发起授权 / 首单顺带授权时作为 authorization_notify_url 传给微信。一期不处理回调内容
     # (授权状态靠 query 查询兜底),但微信要求该字段非空,故启用免确认前必须配置;留空时免确认相关接口返回未配置。

app/core/inactive_clear_worker.py

@@ -0,0 +1,132 @@
+"""连续 N 天无活跃账户金币 / 现金清零的进程内定时任务。
+
+结构同 app.core.daily_exchange_worker:每 `INACTIVE_CLEAR_CHECK_INTERVAL_SEC` 醒一次,
+跨进北京新的一天(0 点后)就跑一轮 inactive_clear.clear_inactive_accounts。
+
+健壮性:
+- **天然幂等**:只清有余额的账户,清完余额=0,下一轮 / 重启 / 多次唤醒都不重复清。
+- **当天首跑即补**:进程起来时若当天还没跑过,立即跑一轮。
+- **同机多进程互斥**:文件锁保证多 worker 只有一个实际跑。
+- **开关**:settings.INACTIVE_CLEAR_ENABLED=false 时不启动。
+
+⚠️ 这是不可逆的批量资金操作(清空用户金币 + 金币现金,邀请金除外)。活跃口径与清零
+细节见 app.repositories.inactive_clear。
+"""
+from __future__ import annotations
+
+import asyncio
+import contextlib
+import logging
+import os
+import time
+from collections.abc import Iterator
+from datetime import date
+from pathlib import Path
+
+from sqlalchemy.exc import SQLAlchemyError
+
+from app.core import rewards
+from app.core.config import settings
+from app.db.session import SessionLocal
+from app.repositories import inactive_clear as inactive_clear_repo
+
+logger = logging.getLogger("shagua.inactive_clear")
+_LOCK_PATH = Path(__file__).resolve().parents[2] / "data" / "inactive_clear.lock"
+
+
+def _touch_lock() -> None:
+    with contextlib.suppress(FileNotFoundError):
+        os.utime(_LOCK_PATH, None)
+
+
+@contextlib.contextmanager
+def _single_instance_lock(stale_after_sec: int) -> Iterator[bool]:
+    """同机多进程保护:同一时间只允许一个清零 worker 运行。"""
+    _LOCK_PATH.parent.mkdir(parents=True, exist_ok=True)
+    fd: int | None = None
+    try:
+        try:
+            fd = os.open(str(_LOCK_PATH), os.O_CREAT | os.O_EXCL | os.O_WRONLY)
+        except FileExistsError:
+            try:
+                age = time.time() - _LOCK_PATH.stat().st_mtime
+            except FileNotFoundError:
+                age = stale_after_sec + 1
+            if age > stale_after_sec:
+                with contextlib.suppress(FileNotFoundError):
+                    _LOCK_PATH.unlink()
+                try:
+                    fd = os.open(str(_LOCK_PATH), os.O_CREAT | os.O_EXCL | os.O_WRONLY)
+                except FileExistsError:
+                    fd = None
+
+        if fd is None:
+            yield False
+            return
+
+        os.write(fd, f"pid={os.getpid()} started_at={int(time.time())}\n".encode("ascii"))
+        yield True
+    finally:
+        if fd is not None:
+            os.close(fd)
+            with contextlib.suppress(FileNotFoundError):
+                _LOCK_PATH.unlink()
+
+
+def _clear_once() -> dict:
+    with SessionLocal() as db:
+        return inactive_clear_repo.clear_inactive_accounts(
+            db, days=settings.INACTIVE_CLEAR_DAYS
+        )
+
+
+async def _run_loop() -> None:
+    interval = max(60, int(settings.INACTIVE_CLEAR_CHECK_INTERVAL_SEC))
+    lock_stale_after = max(interval * 3, 1800)
+    with _single_instance_lock(lock_stale_after) as lock_acquired:
+        if not lock_acquired:
+            logger.warning("inactive-clear skipped: another worker owns lock")
+            return
+        await _run_locked_loop(interval)
+
+
+async def _run_locked_loop(interval: int) -> None:
+    logger.info(
+        "inactive-clear worker started interval=%ss days=%s",
+        interval,
+        settings.INACTIVE_CLEAR_DAYS,
+    )
+    # 本进程上次跑过的北京日;None=尚未跑过本进程(启动即补当天)。
+    last_run: date | None = None
+    try:
+        while True:
+            try:
+                _touch_lock()
+                today = rewards.cn_today()
+                if last_run != today:
+                    result = await asyncio.to_thread(_clear_once)
+                    last_run = today
+                    logger.info("inactive-clear done date=%s result=%s", today, result)
+            except SQLAlchemyError:
+                logger.exception("inactive-clear db error")
+            except Exception:  # noqa: BLE001 - 后台任务不能因单次异常退出
+                logger.exception("inactive-clear unexpected error")
+            await asyncio.sleep(interval)
+    except asyncio.CancelledError:
+        logger.info("inactive-clear worker stopped")
+        raise
+
+
+def start_inactive_clear_worker() -> asyncio.Task | None:
+    if not settings.INACTIVE_CLEAR_ENABLED:
+        logger.info("inactive-clear disabled (INACTIVE_CLEAR_ENABLED=false)")
+        return None
+    return asyncio.create_task(_run_loop(), name="inactive-clear")
+
+
+async def stop_inactive_clear_worker(task: asyncio.Task | None) -> None:
+    if task is None:
+        return
+    task.cancel()
+    with contextlib.suppress(asyncio.CancelledError):
+        await task

app/integrations/oppo_push.py

@@ -1,183 +0,0 @@
-"""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/wx_mp_crypto.py

@@ -1,69 +0,0 @@
-"""微信服务号消息接收回调的验签与解密(安全模式)。
-
-服务号"服务器配置"选安全模式后:
-  - 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,7 +39,6 @@ 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 (
@@ -50,6 +49,10 @@ from app.core.heartbeat_monitor_worker import (
     start_heartbeat_monitor,
     stop_heartbeat_monitor,
 )
+from app.core.inactive_clear_worker import (
+    start_inactive_clear_worker,
+    stop_inactive_clear_worker,
+)
 from app.core.logging import setup_logging
 from app.core.pricebot_client import aclose_pricebot_client, get_pricebot_client
 from app.core.withdraw_reconcile_worker import (
@@ -75,18 +78,21 @@ async def lifespan(_: FastAPI) -> AsyncIterator[None]:
     try:
         # 预热离线地理库:首次加载 ~2.5M 行 CSV + 建 KDTree,摊到启动、不砸首个按城市过滤的请求
         from app.utils import geo
+
         geo.ensure_loaded()
     except Exception:  # noqa: BLE001
         logger.exception("reverse_geocoder 预热失败(城市反查将在首个请求时懒加载)")
     reconcile_task = start_withdraw_reconcile_worker()
     heartbeat_task = start_heartbeat_monitor()
     daily_exchange_task = start_daily_exchange_worker()
+    inactive_clear_task = start_inactive_clear_worker()
     try:
         yield
     finally:
         await stop_heartbeat_monitor(heartbeat_task)
         await stop_withdraw_reconcile_worker(reconcile_task)
         await stop_daily_exchange_worker(daily_exchange_task)
+        await stop_inactive_clear_worker(inactive_clear_task)
         await aclose_pricebot_client()
         logger.info("shutting down")
 
@@ -141,8 +147,6 @@ 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/device.py

@@ -44,9 +44,6 @@ 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/repositories/device.py

@@ -22,18 +22,16 @@ 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 / oppo_register_id / 元信息。upsert by (user_id, device_id)。"""
+    """注册设备或更新其 registration_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,
         )
@@ -41,8 +39,6 @@ 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:
@@ -59,13 +55,11 @@ 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(掉线恢复 → 下次再断才会再推一条)。registration_id / oppo_register_id
-    非空时顺带更新(客户端拿到 push token 后每次心跳带上, 后端最终一致)。
+    清掉 notified_at(掉线恢复 → 下次再断才会再推一条)。
     """
     now = datetime.now(timezone.utc)
     device = _get(db, user_id=user_id, device_id=device_id)
@@ -75,8 +69,6 @@ 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:
@@ -126,25 +118,6 @@ 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/inactive_clear.py

@@ -0,0 +1,168 @@
+"""连续 N 天无活跃账户的金币 / 现金清零。
+
+规则(2026-07-15 产品定):某用户连续 `days` 天(默认 15)既没发起比价、也没发起领券
+→ 判定为「流失」,清空其金币余额(coin_balance)与金币兑换现金(cash_balance_cents)。
+**单纯登录(打开 App)不算活跃**——光登录、不用比价/领券的用户视为流失照清。
+**邀请奖励金(invite_cash_balance_cents)物理隔离,不在清空范围**(产品红线,见
+models/wallet.py CoinAccount 注释);total_coin_earned(历史累计赚取,只增不减)也不动。
+
+活跃口径:发起比价 real_compare_start + 发起领券 real_coupon_start / claim_started
+两路并集(**不含登录 last_login_at**)。⚠️与 admin 大盘 DAU / 后台「最近活跃」列**不同**
+——那两处含登录,此处刻意去掉,只认真正用了核心功能;若两处口径要同步须留意此差异。
+
+新用户保护:从没发起过比价/领券的用户永远不在活跃集合,故用**注册时间兜底**——注册未满
+days 天(created_at 在 today-days 之后)的用户豁免清零,新用户有 days 天宽限,不会刚注册
+(有礼金)就被清。(登录已不算活跃,故不能再靠 last_login 兜底新用户。)
+
+清零走 wallet.grant_coins / grant_cash(负数出账入口):更新余额快照 + 写一笔
+biz_type=inactive_clear 的流水(带 balance_after),可逐笔回溯 / 人工恢复;grant_coins
+对负数不累加 total_coin_earned。
+"""
+from __future__ import annotations
+
+from datetime import UTC, date, datetime, timedelta
+
+from sqlalchemy import or_, select
+from sqlalchemy.orm import Session
+
+from app.core import rewards
+from app.models.analytics_event import AnalyticsEvent
+from app.models.coupon_state import CouponPromptEngagement
+from app.models.user import User
+from app.models.wallet import CoinAccount
+from app.repositories.wallet import get_or_create_account, grant_cash, grant_coins
+
+CLEAR_BIZ_TYPE = "inactive_clear"
+# 「活跃」计入的埋点事件:发起比价 + 发起领券(登录不算)
+_ACTIVE_EVENTS = ("real_compare_start", "real_coupon_start")
+
+
+def _cn_date_start_utc(d: date) -> datetime:
+    """北京自然日 d 的 00:00 → UTC aware 下界。
+
+    analytics_event.created_at / user.created_at 存 UTC(见各自模型),须用 UTC 边界比较;
+    CN_TZ 是固定 +8 偏移(rewards.CN_TZ),无 DST 歧义。
+    """
+    return datetime(d.year, d.month, d.day, tzinfo=rewards.CN_TZ).astimezone(UTC)
+
+
+def _active_user_ids_since(db: Session, since_cn: date) -> set[int]:
+    """北京自然日 since_cn(含)当天 0 点起 **发起过比价 / 领券** 的 user_id 集合。
+
+    **登录不算活跃**(产品定):只认核心功能行为。两路并集:
+      - 发起比价 / 领券:analytics_event.event in _ACTIVE_EVENTS 且 created_at >= since(UTC 边界)
+      - 发起领券:coupon_prompt_engagement.engage_type=claim_started 且 engage_date >= since(北京日列)
+    """
+    since_utc = _cn_date_start_utc(since_cn)
+    ids: set[int] = set()
+
+    ids.update(
+        uid
+        for uid in db.execute(
+            select(AnalyticsEvent.user_id).where(
+                AnalyticsEvent.user_id.is_not(None),
+                AnalyticsEvent.event.in_(_ACTIVE_EVENTS),
+                AnalyticsEvent.created_at >= since_utc,
+            )
+        ).scalars()
+        if uid is not None
+    )
+    ids.update(
+        uid
+        for uid in db.execute(
+            select(CouponPromptEngagement.user_id).where(
+                CouponPromptEngagement.user_id.is_not(None),
+                CouponPromptEngagement.engage_type == "claim_started",
+                CouponPromptEngagement.engage_date >= since_cn,
+            )
+        ).scalars()
+        if uid is not None
+    )
+    return ids
+
+
+def _new_user_ids_since(db: Session, since_cn: date) -> set[int]:
+    """注册时间 >= since_cn 北京日 0 点的 user_id——注册未满 days 天的新用户,豁免清零。"""
+    since_utc = _cn_date_start_utc(since_cn)
+    return set(db.execute(select(User.id).where(User.created_at >= since_utc)).scalars())
+
+
+def clear_inactive_accounts(db: Session, *, days: int, dry_run: bool = False) -> dict:
+    """连续无活跃**满 `days` 整天之后**把用户金币 + 金币现金清零(邀请金不动),逐用户独立事务。
+
+    - 活跃 = 发起比价 / 发起领券(**登录不算**)。last_active >= today-days 视为活跃;连续无
+      比价无领券满 days 天(且注册也满 days 天)才清。days=15 → 最后一次比价/领券在 15 天前
+      当天仍留、第 16 天起清。today 一律北京时(rewards.cn_today())。
+    - 新用户保护:注册未满 days 天(created_at 在 today-days 之后)豁免,不会刚注册就被清。
+    - 只扫描有余额(coin_balance>0 或 cash_balance_cents>0)的账户:清零后余额=0,下一轮
+      自然跳过 → 天然幂等,重启 / 多次唤醒 / 补跑都安全。
+    - 逐用户独立事务:单用户异常 rollback 不影响其他人。
+    - dry_run=True:只统计不写库(供运营上线前预演:看会清哪些人、清多少)。
+
+    返回统计 dict(scanned/cleared/skipped_active/skipped_new_user/coin_cleared/
+    cents_cleared/failed)。
+    """
+    # days<1 会把 active_since 推到未来 → 全员判流失清空(灾难);防御性钳到 >=1。
+    days = max(1, days)
+    today = rewards.cn_today()
+    # 连续无活跃满 days 整天之后才清:active_since=today-days,活跃/新用户都以此为边界。
+    active_since = today - timedelta(days=days)
+    active_ids = _active_user_ids_since(db, active_since)
+    new_user_ids = _new_user_ids_since(db, active_since)
+
+    # 只取候选 user_id;清零金额在循环内读**实时**余额(不用此处快照)——活跃集合算完到逐行
+    # 清零之间余额可能变(如并发看广告发币),用快照 grant 会清不干净、balance_after≠0。
+    candidate_ids = (
+        db.execute(
+            select(CoinAccount.user_id).where(
+                or_(CoinAccount.coin_balance > 0, CoinAccount.cash_balance_cents > 0)
+            )
+        )
+        .scalars()
+        .all()
+    )
+
+    stats = {
+        "scanned": 0,
+        "cleared": 0,
+        "skipped_active": 0,
+        "skipped_new_user": 0,
+        "coin_cleared": 0,
+        "cents_cleared": 0,
+        "failed": 0,
+    }
+    remark = f"连续{days}天无活跃清零"
+    for user_id in candidate_ids:
+        stats["scanned"] += 1
+        if user_id in active_ids:
+            stats["skipped_active"] += 1
+            continue
+        if user_id in new_user_ids:  # 注册未满 days 天,新用户宽限
+            stats["skipped_new_user"] += 1
+            continue
+        if dry_run:
+            acc = db.get(CoinAccount, user_id)
+            if acc is not None:
+                stats["cleared"] += 1
+                stats["coin_cleared"] += acc.coin_balance
+                stats["cents_cleared"] += acc.cash_balance_cents
+            continue
+        try:
+            # lock=True 对该账户行加 FOR UPDATE(PG 生效,SQLite no-op),读-清-写串行化防并发
+            acc = get_or_create_account(db, user_id, commit=False, lock=True)
+            coin, cents = acc.coin_balance, acc.cash_balance_cents
+            if coin <= 0 and cents <= 0:
+                continue  # 快照后被并发清空 / 变动,无需再清
+            if coin > 0:
+                grant_coins(db, user_id, -coin, biz_type=CLEAR_BIZ_TYPE, remark=remark)
+            if cents > 0:
+                grant_cash(db, user_id, -cents, biz_type=CLEAR_BIZ_TYPE, remark=remark)
+            db.commit()
+            stats["cleared"] += 1
+            stats["coin_cleared"] += coin
+            stats["cents_cleared"] += cents
+        except Exception:  # noqa: BLE001 - 批处理不因单用户异常中断
+            db.rollback()
+            stats["failed"] += 1
+
+    return stats

app/schemas/device.py

@@ -9,7 +9,6 @@ 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
 
@@ -19,7 +18,6 @@ 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):
@@ -28,7 +26,6 @@ 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

@@ -1,74 +0,0 @@
-"""推送通知编排(查设备 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,81 +476,3 @@ 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_oppo_push.py

@@ -1,101 +0,0 @@
-"""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

@@ -1,70 +0,0 @@
-"""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()