Merge remote-tracking branch 'origin/main' into coupon_home_ui

# Conflicts:
#	app/api/v1/coupon.py
#	app/repositories/coupon_state.py

app/api/v1/ad.py

@@ -10,6 +10,7 @@
 from __future__ import annotations
 
 import logging
+import json
 import uuid
 
 from fastapi import APIRouter, Depends, HTTPException, Request, status
@@ -23,6 +24,7 @@ from app.repositories import ad_ecpm as crud_ecpm
 from app.repositories import ad_feed_reward as crud_feed
 from app.repositories import ad_reward as crud_ad
 from app.repositories import ad_watch as crud_watch
+from app.repositories import signin as crud_signin
 from app.schemas.ad import (
     AdRewardStatusOut,
     EcpmReportIn,
@@ -30,6 +32,7 @@ from app.schemas.ad import (
     FeedRewardIn,
     FeedRewardOut,
     PangleCallbackOut,
+    TestGrantIn,
     TestGrantOut,
     WatchReportIn,
     WatchReportOut,
@@ -44,6 +47,23 @@ REASON_OK = 0
 REASON_BAD_PARAMS = 1  # 验签过但缺 trans_id / user_id 非数字
 REASON_UNKNOWN_USER = 2  # user_id 不存在(可能伪造)
 
+REWARD_SCENE_REWARD_VIDEO = "reward_video"
+REWARD_SCENE_SIGNIN_BOOST = "signin_boost"
+SUPPORTED_REWARD_SCENES = {REWARD_SCENE_REWARD_VIDEO, REWARD_SCENE_SIGNIN_BOOST}
+
+
+def _parse_extra(raw_extra: str | None) -> dict[str, str]:
+    """解析客户端 setMediaExtra 透传的 JSON;旧格式/异常返回空 dict。"""
+    if not raw_extra:
+        return {}
+    try:
+        data = json.loads(raw_extra)
+    except (TypeError, ValueError):
+        return {}
+    if not isinstance(data, dict):
+        return {}
+    return {str(k): str(v) for k, v in data.items() if v is not None}
+
 
 @router.get(
     "/pangle-callback",
@@ -52,9 +72,9 @@ REASON_UNKNOWN_USER = 2  # user_id 不存在(可能伪造)
     dependencies=[Depends(rate_limit(300, 60, "pangle-callback"))],
 )
 def pangle_callback(request: Request, db: DbSession) -> PangleCallbackOut:
-    """穿山甲 GroMore 在激励视频播完后回调,带 user_id / trans_id / reward_amount / sign 等 query 参数。
+    """穿山甲 GroMore 在激励视频播完后回调,带 user_id / trans_id / ecpm / sign 等 query 参数。
 
-    流程:开关/密钥就绪 → 验签(SHA256(m-key:trans_id)) → 解析 user_id/reward_amount → 幂等发金币。
+    流程:开关/密钥就绪 → 验签(SHA256(m-key:trans_id)) → 解析 user_id/场景/eCPM → 幂等发金币。
     验签失败 403(留给真请求重试);参数缺/坏或 user 不存在 → is_verify=false + reason(不发,不重试)。
     granted / capped → is_verify=true + reason=0。
     """
@@ -77,19 +97,86 @@ def pangle_callback(request: Request, db: DbSession) -> PangleCallbackOut:
         return PangleCallbackOut(is_verify=False, reason=REASON_BAD_PARAMS)
 
     user_id = int(raw_user_id)
-    coin = rewards.resolve_ad_reward_coin(db, params.get("reward_amount"))
     raw = "&".join(f"{k}={v}" for k, v in sorted(params.items()) if k != "sign")
-    try:
-        rec = crud_ad.grant_ad_reward(
-            db, user_id, trans_id, coin=coin,
-            reward_name=params.get("reward_name"), raw=raw[:1024],
+    extra = {}
+    for extra_key in ("extra", "gromoreExtra", "gromore_extra"):
+        extra.update(_parse_extra(params.get(extra_key)))
+    reward_scene = extra.get("reward_scene") or REWARD_SCENE_REWARD_VIDEO
+    ad_session_id = extra.get("ad_session_id")
+    ecpm = params.get("ecpm")
+
+    existing = crud_ad.find_by_trans(db, trans_id)
+    if existing is not None:
+        logger.info(
+            "pangle callback idempotent user_id=%d trans_id=%s status=%s scene=%s",
+            user_id, trans_id, existing.status, existing.reward_scene,
         )
+        return PangleCallbackOut(is_verify=True, reason=REASON_OK)
+
+    try:
+        if reward_scene not in SUPPORTED_REWARD_SCENES:
+            rec = crud_ad.record_external_reward(
+                db, user_id, trans_id, coin=0, reward_scene=reward_scene[:32],
+                ad_session_id=ad_session_id, ecpm=ecpm,
+                reward_name=params.get("reward_name"), raw=raw[:1024],
+                status="unknown_scene",
+            )
+            logger.warning(
+                "pangle callback unknown scene user_id=%d trans_id=%s scene=%s",
+                user_id, trans_id, reward_scene,
+            )
+            return PangleCallbackOut(is_verify=False, reason=REASON_BAD_PARAMS)
+        if reward_scene == REWARD_SCENE_SIGNIN_BOOST:
+            try:
+                boost, _balance = crud_signin.boost_today_signin(
+                    db, user_id, ad_ref_id=trans_id, commit=False
+                )
+            except crud_signin.NotSignedTodayError:
+                db.rollback()
+                rec = crud_ad.record_external_reward(
+                    db, user_id, trans_id, coin=0, reward_scene=reward_scene,
+                    ad_session_id=ad_session_id, ecpm=ecpm,
+                    reward_name=params.get("reward_name"), raw=raw[:1024],
+                    status="not_signed",
+                )
+            except crud_signin.AlreadyBoostedError:
+                db.rollback()
+                rec = crud_ad.record_external_reward(
+                    db, user_id, trans_id, coin=0, reward_scene=reward_scene,
+                    ad_session_id=ad_session_id, ecpm=ecpm,
+                    reward_name=params.get("reward_name"), raw=raw[:1024],
+                    status="already_boosted",
+                )
+            except crud_signin.LastCycleDayBoostBlockedError:
+                db.rollback()
+                rec = crud_ad.record_external_reward(
+                    db, user_id, trans_id, coin=0, reward_scene=reward_scene,
+                    ad_session_id=ad_session_id, ecpm=ecpm,
+                    reward_name=params.get("reward_name"), raw=raw[:1024],
+                    status="last_day",
+                )
+            else:
+                rec = crud_ad.record_external_reward(
+                    db, user_id, trans_id, coin=boost.coin_awarded,
+                    reward_scene=reward_scene, ad_session_id=ad_session_id, ecpm=ecpm,
+                    reward_name=params.get("reward_name"), raw=raw[:1024],
+                    commit=False,
+                )
+                db.commit()
+                db.refresh(rec)
+        else:
+            rec = crud_ad.grant_ad_reward(
+                db, user_id, trans_id, ecpm=ecpm, ad_session_id=ad_session_id,
+                reward_scene=REWARD_SCENE_REWARD_VIDEO,
+                reward_name=params.get("reward_name"), raw=raw[:1024],
+            )
     except crud_ad.UnknownUserError:
         logger.warning("pangle callback unknown user_id=%d trans_id=%s", user_id, trans_id)
         return PangleCallbackOut(is_verify=False, reason=REASON_UNKNOWN_USER)
 
     logger.info(
-        "ad reward user_id=%d trans_id=%s status=%s coin=%d", user_id, trans_id, rec.status, rec.coin
+        "ad reward user_id=%d trans_id=%s scene=%s status=%s coin=%d",
+        user_id, trans_id, rec.reward_scene, rec.status, rec.coin,
     )
     # granted / capped 均算"已处理":is_verify=true 不让穿山甲重试(capped 只是没加币)
     return PangleCallbackOut(is_verify=True, reason=REASON_OK)
@@ -153,11 +240,12 @@ def ecpm_report(payload: EcpmReportIn, user: CurrentUser, db: DbSession) -> Ecpm
     crud_ecpm.create_ecpm_record(
         db, user.id,
         ad_type=payload.ad_type, ecpm_raw=payload.ecpm,
+        ad_session_id=payload.ad_session_id,
         adn=payload.adn, slot_id=payload.slot_id,
     )
     logger.info(
-        "ad ecpm report user_id=%d type=%s ecpm=%s adn=%s slot=%s",
-        user.id, payload.ad_type, payload.ecpm, payload.adn, payload.slot_id,
+        "ad ecpm report user_id=%d type=%s session=%s ecpm=%s adn=%s slot=%s",
+        user.id, payload.ad_type, payload.ad_session_id, payload.ecpm, payload.adn, payload.slot_id,
     )
     return EcpmReportOut(ok=True)
 
@@ -168,7 +256,7 @@ def ecpm_report(payload: EcpmReportIn, user: CurrentUser, db: DbSession) -> Ecpm
     summary="[仅本地联调]模拟穿山甲回调发奖",
     dependencies=[Depends(rate_limit(60, 60, "ad-test-grant"))],
 )
-def test_grant(user: CurrentUser, db: DbSession) -> TestGrantOut:
+def test_grant(user: CurrentUser, db: DbSession, payload: TestGrantIn | None = None) -> TestGrantOut:
     """⚠️ 仅本地联调用:没部署公网、穿山甲 S2S 回调打不到本地时,客户端(debug 包)看完广告后
     调这个接口,直接走与回调相同的发奖逻辑(幂等 + 每日上限),验证"看广告→金币到账"全链路。
 
@@ -178,18 +266,66 @@ def test_grant(user: CurrentUser, db: DbSession) -> TestGrantOut:
     if not settings.AD_REWARD_TEST_GRANT_ENABLED:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="not found")
 
-    # 每次新 trans_id,模拟一次独立的穿山甲发奖回调(幂等键各不相同 → 每次都发,直到当日上限)
+    reward_scene = (payload.reward_scene if payload is not None else REWARD_SCENE_REWARD_VIDEO)
+    if reward_scene not in SUPPORTED_REWARD_SCENES:
+        raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail="bad reward_scene")
+
+    # 每次新 trans_id,模拟一次独立的穿山甲发奖回调(幂等键各不相同 → 每次都发,直到当日上限/今日膨胀一次)
     trans_id = f"test-{user.id}-{uuid.uuid4().hex}"
-    try:
-        rec = crud_ad.grant_ad_reward(
-            db, user.id, trans_id, reward_name="测试发奖", raw="client debug test-grant"
-        )
-    except crud_ad.UnknownUserError as e:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="user not found") from e
+    if reward_scene == REWARD_SCENE_SIGNIN_BOOST:
+        try:
+            boost, _balance = crud_signin.boost_today_signin(
+                db, user.id, ad_ref_id=trans_id, commit=False
+            )
+        except crud_signin.NotSignedTodayError:
+            db.rollback()
+            rec = crud_ad.record_external_reward(
+                db, user.id, trans_id, coin=0, reward_scene=reward_scene,
+                raw="client debug test-grant signin_boost", status="not_signed",
+            )
+        except crud_signin.AlreadyBoostedError:
+            db.rollback()
+            rec = crud_ad.record_external_reward(
+                db, user.id, trans_id, coin=0, reward_scene=reward_scene,
+                raw="client debug test-grant signin_boost", status="already_boosted",
+            )
+        except crud_signin.LastCycleDayBoostBlockedError:
+            db.rollback()
+            rec = crud_ad.record_external_reward(
+                db, user.id, trans_id, coin=0, reward_scene=reward_scene,
+                raw="client debug test-grant signin_boost", status="last_day",
+            )
+        else:
+            rec = crud_ad.record_external_reward(
+                db, user.id, trans_id, coin=boost.coin_awarded,
+                reward_scene=reward_scene, reward_name="测试签到膨胀",
+                raw="client debug test-grant signin_boost", commit=False,
+            )
+            db.commit()
+            db.refresh(rec)
+    else:
+        # 优先用客户端按 ad_session_id 上报的真实 eCPM(走与正式发奖相同的公式);
+        # 取不到或 eCPM≤0(测试应用常返 0/假值)时兜底 200,保证本地联调仍能验出非零金币。
+        ad_session_id = payload.ad_session_id if payload is not None else None
+        ecpm_val = "200"
+        if ad_session_id:
+            ecpm_rec = crud_ecpm.find_by_session(db, user_id=user.id, ad_session_id=ad_session_id)
+            if ecpm_rec is not None and rewards.parse_ecpm_fen(ecpm_rec.ecpm_raw) > 0:
+                ecpm_val = ecpm_rec.ecpm_raw
+        try:
+            rec = crud_ad.grant_ad_reward(
+                db, user.id, trans_id, ecpm=ecpm_val, ad_session_id=ad_session_id,
+                reward_name="测试发奖", raw=f"client debug test-grant ecpm={ecpm_val}",
+            )
+        except crud_ad.UnknownUserError as e:
+            raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="user not found") from e
 
     (used, limit, coin_per, round_count, cooldown_until,
      _watched, _watch_limit) = crud_ad.today_status(db, user.id)
-    logger.info("ad TEST grant user_id=%d status=%s coin=%d", user.id, rec.status, rec.coin)
+    logger.info(
+        "ad TEST grant user_id=%d scene=%s status=%s coin=%d",
+        user.id, reward_scene, rec.status, rec.coin,
+    )
     return TestGrantOut(
         granted=(rec.status == "granted"),
         status=rec.status,
@@ -220,6 +356,7 @@ def feed_reward(payload: FeedRewardIn, user: CurrentUser, db: DbSession) -> Feed
         client_event_id=payload.client_event_id,
         ecpm=payload.ecpm,
         duration_seconds=payload.duration_seconds,
+        ad_session_id=payload.ad_session_id,
         adn=payload.adn,
         slot_id=payload.slot_id,
     )

app/api/v1/compare_record.py

@@ -77,10 +77,12 @@ def list_records(
     items, next_cursor = crud_compare.list_records(
         db, user.id, limit=limit, cursor=cursor
     )
-    return ComparisonRecordPage(
-        items=[ComparisonRecordOut.model_validate(it) for it in items],
-        next_cursor=next_cursor,
-    )
+    outs = [ComparisonRecordOut.model_validate(it) for it in items]
+    # 权限闸:未开 debug_trace_enabled 的用户不下发 trace_url(列表页「复制调试链接」靠它)
+    if not user.debug_trace_enabled:
+        for o in outs:
+            o.trace_url = None
+    return ComparisonRecordPage(items=outs, next_cursor=next_cursor)
 
 
 @router.get(
@@ -94,4 +96,12 @@ def get_record(
     rec = crud_compare.get_record(db, user.id, record_id)
     if rec is None:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="record not found")
-    return ComparisonRecordDetailOut.model_validate(rec)
+    out = ComparisonRecordDetailOut.model_validate(rec)
+    # 权限闸:未开 debug_trace_enabled 的用户不下发 trace_url。
+    # ⚠️ raw_payload 是上报体全量(model_dump),里面也藏着一份 trace_url,必须一并抹掉——
+    # 否则无权限用户从详情接口的 raw_payload 绕过权限闸拿到 trace_url。
+    if not user.debug_trace_enabled:
+        out.trace_url = None
+        if isinstance(out.raw_payload, dict):
+            out.raw_payload.pop("trace_url", None)
+    return out

app/api/v1/coupon.py

@@ -208,12 +208,20 @@ def coupon_prompt_should_show(
     device_id: str, db: DbSession
 ) -> CouponPromptShouldShowOut:
     """今天这台设备已 engage(领或拒)过 → should_show=false。客户端据此决定弹不弹
-    (前台 SP 缓存做快速路径,这里是权威)。"""
+    (纯后台判据,客户端不再做前台 SP 缓存判断)。"""
     return CouponPromptShouldShowOut(
         should_show=not coupon_repo.has_engaged_today(db, device_id)
     )
 
 
+@router.post("/prompt/reset", summary="重置今日领券引导窗 engagement(开发测频控用)")
+def coupon_prompt_reset(payload: CouponPromptDismissIn, db: DbSession) -> dict[str, bool]:
+    """删这台设备今天的 engagement → has_engaged_today 变 false,今天又能弹。
+    开发设置「重置今日领券弹窗状态」按钮调。MVP 不鉴权,按 device_id。"""
+    coupon_repo.reset_today_engagement(db, payload.device_id)
+    return {"ok": True}
+
+
 @router.get(
     "/completed-today",
     response_model=CouponCompletedTodayOut,

app/api/v1/invite.py

@@ -1,25 +1,37 @@
 """好友邀请 endpoint。
 
-路由前缀 /api/v1/invite,需 Bearer 鉴权(用户级数据):
-  GET  /me     我的邀请码 + 分享链接 + 已邀人数/已得金币(邀请页展示)
-  POST /bind   把当前登录用户(被邀请人)绑定到某邀请码,注册即生效,双方各发金币
+路由前缀 /api/v1/invite,需 Bearer 鉴权(用户级数据);唯一例外是 /landing-track
+(落地页 dl.html 浏览器访问、无 token,详见任务 3 [[invite-three-tasks]]):
+  GET  /me                我的邀请码 + 分享链接 + 已邀人数/已得金币(邀请页展示)
+  POST /bind              把当前登录用户(被邀请人)绑定到某邀请码;支持三种归因:
+                          ① clipboard:首启读剪贴板拿邀请码 → 上报码
+                          ② manual:用户在邀请页输入邀请码 → 上报码
+                          ③ fingerprint:剪贴板没拿到时上报指纹,后端反查
+  POST /landing-track     落地页 dl.html 访问时上报指纹(剪贴板兜底的服务端一端,无需鉴权)
 
-客户端两种调用 /bind:
-  - 自动:首启读剪贴板拿到邀请码 → 登录后调本接口(channel=clipboard)
-  - 手动:用户在邀请页输入好友邀请码(channel=manual)
-
-绑定的真正逻辑(邀请码生成/反查、幂等、自邀屏蔽、发金币)在 repositories/invite.py。
+绑定的真正逻辑(邀请码生成/反查、幂等、自邀屏蔽、发金币、指纹反查)在
+repositories/invite.py。
 """
 from __future__ import annotations
 
 import logging
+import re
 
-from fastapi import APIRouter
+from fastapi import APIRouter, Request
 
 from app.api.deps import CurrentUser, DbSession
+from app.core import rewards
 from app.core.config import settings
 from app.repositories import invite as invite_repo
-from app.schemas.invite import BindInviteIn, BindInviteOut, InviteInfoOut
+from app.schemas.invite import (
+    BindInviteIn,
+    BindInviteOut,
+    InviteeItem,
+    InviteeListOut,
+    InviteInfoOut,
+    LandingTrackIn,
+    LandingTrackOut,
+)
 
 logger = logging.getLogger("shagua.invite")
 
@@ -31,9 +43,43 @@ _BIND_MESSAGES = {
     "invalid_code": "邀请码无效",
     "self_invite": "不能填写自己的邀请码",
     "not_eligible": "邀请仅对新注册用户生效",
+    "fp_not_found": "未匹配到邀请关系",
 }
 
 
+def _client_ip(request: Request) -> str:
+    """从 HTTP 头拿真实 IP。nginx 反代时走 X-Forwarded-For;裸跑 uvicorn 走 request.client。"""
+    xff = request.headers.get("x-forwarded-for", "")
+    if xff:
+        # X-Forwarded-For 可能是 "client, proxy1, proxy2" 链;取第一个 = 真实客户端
+        return xff.split(",")[0].strip()
+    return request.client.host if request.client else ""
+
+
+# Android UA 形如 '... ; <Model> Build/<id>) AppleWebKit/...';抓 ';' 后到 ' Build/' 前
+# 的 token = Build.MODEL(跨端跟客户端 android.os.Build.MODEL 对齐)。user-agents 库
+# 把 Android 设备归为 'Smartphone' 通用名,抓不到真实型号,只能正则。
+_ANDROID_BUILD_MODEL_RE = re.compile(r";\s*([^;]+?)\s+Build/", re.IGNORECASE)
+
+
+def _parse_device_model(ua: str) -> str:
+    """解析浏览器 UA 拿手机型号(如 '24115RA8EC'、'PJF110')。
+
+    Android:正则抓 UA 里 ';...Build/' 前的 token(== Build.MODEL),跨端可严格匹配。
+    iOS / 解析不到:退到 user-agents 库的通用解析,失败/UA 空 → 返空字符串。
+    """
+    if not ua:
+        return ""
+    m = _ANDROID_BUILD_MODEL_RE.search(ua)
+    if m:
+        return m.group(1).strip()
+    try:
+        from user_agents import parse
+        return (parse(ua).device.model or "").strip()
+    except Exception:  # noqa: BLE001
+        return ""
+
+
 @router.get("/me", response_model=InviteInfoOut, summary="我的邀请码 + 分享链接 + 战绩")
 def my_invite(user: CurrentUser, db: DbSession) -> InviteInfoOut:
     code = invite_repo.ensure_code(db, user)
@@ -48,17 +94,124 @@ def my_invite(user: CurrentUser, db: DbSession) -> InviteInfoOut:
     )
 
 
-@router.post("/bind", response_model=BindInviteOut, summary="绑定邀请人(注册即生效,双方发金币)")
-def bind_invite(req: BindInviteIn, user: CurrentUser, db: DbSession) -> BindInviteOut:
-    result = invite_repo.bind(
-        db, invitee=user, invite_code=req.invite_code, channel=req.channel,
+@router.get("/invitees", response_model=InviteeListOut, summary="我邀请的人列表(分页)")
+def my_invitees(
+    user: CurrentUser, db: DbSession, limit: int = 20, offset: int = 0
+) -> InviteeListOut:
+    """邀请页小窗(取前几条) + 完整列表页(分页加载)共用。
+
+    名字/头像的降级兜底在 repositories/invite.get_invitees 算好,这里只组装响应。
+    limit 夹到 [1,50] 防滥用;offset 不小于 0。
+    """
+    limit = max(1, min(limit, 50))
+    offset = max(0, offset)
+    items, total, has_more = invite_repo.get_invitees(
+        db, user.id, limit=limit, offset=offset,
+    )
+    return InviteeListOut(
+        items=[InviteeItem(**it) for it in items],
+        total=total,
+        has_more=has_more,
+    )
+
+
+@router.post(
+    "/landing-track",
+    response_model=LandingTrackOut,
+    summary="落地页指纹采集(无需鉴权)",
+)
+def landing_track(
+    req: LandingTrackIn, request: Request, db: DbSession
+) -> LandingTrackOut:
+    """B 浏览器打开 dl.html?ref=xxx 时上报指纹。
+
+    服务端从 HTTP 头拿 IP/UA、解析 UA 拿 device_model,跟 req.screen 一起入库。
+    无需鉴权(浏览器没 token)。invalid_code / no_ip 走 silent 返回(不抛 5xx 影响下载流程)。
+    """
+    inviter = invite_repo.resolve_inviter(db, req.ref)
+    if inviter is None or inviter.status != "active":
+        return LandingTrackOut(status="invalid_code")
+
+    ip = _client_ip(request)
+    if not ip:
+        return LandingTrackOut(status="no_ip")
+
+    ua_str = request.headers.get("user-agent", "")
+    device_model = _parse_device_model(ua_str)
+
+    invite_repo.record_fingerprint(
+        db,
+        inviter_user_id=inviter.id,
+        ip=ip,
+        screen=req.screen,
+        device_model=device_model,
+        user_agent=ua_str,
     )
     logger.info(
-        "invite bind invitee=%d code=%s channel=%s -> %s",
-        user.id, req.invite_code, req.channel, result.status,
+        "invite landing-track inviter=%d ip=%s screen=%s model=%s",
+        inviter.id, ip, req.screen, device_model,
     )
+    return LandingTrackOut(status="ok")
+
+
+@router.post("/bind", response_model=BindInviteOut, summary="绑定邀请人(注册即生效,双方发金币)")
+def bind_invite(
+    req: BindInviteIn, user: CurrentUser, db: DbSession, request: Request
+) -> BindInviteOut:
+    code = (req.invite_code or "").strip()
+
+    # 路径 1:有邀请码 → 走原路径(clipboard / manual)
+    if code:
+        result = invite_repo.bind(
+            db, invitee=user, invite_code=code, channel=req.channel,
+        )
+        logger.info(
+            "invite bind invitee=%d code=%s channel=%s -> %s",
+            user.id, code, req.channel, result.status,
+        )
+        return BindInviteOut(
+            status=result.status,
+            coins_awarded=result.invitee_coin,
+            message=_BIND_MESSAGES.get(result.status, result.status),
+        )
+
+    # 路径 2:无邀请码 + 有指纹 → 指纹兜底反查
+    if req.fingerprint is not None:
+        ip = _client_ip(request)
+        inviter = invite_repo.resolve_inviter_by_fingerprint(
+            db,
+            ip=ip,
+            screen=req.fingerprint.screen,
+            device_model=req.fingerprint.device_model,
+            window_days=rewards.INVITE_FP_WINDOW_DAYS,
+        )
+        if inviter is None:
+            logger.info(
+                "invite bind invitee=%d fingerprint not_found ip=%s screen=%s model=%s",
+                user.id, ip, req.fingerprint.screen, req.fingerprint.device_model,
+            )
+            return BindInviteOut(
+                status="fp_not_found",
+                coins_awarded=0,
+                message=_BIND_MESSAGES["fp_not_found"],
+            )
+        # 用反查到的 inviter.invite_code 走原 bind 流程(走原幂等/自邀/新人闸/发币逻辑)
+        result = invite_repo.bind(
+            db, invitee=user, invite_code=inviter.invite_code, channel="fingerprint",
+        )
+        logger.info(
+            "invite bind invitee=%d fingerprint -> inviter=%d code=%s -> %s",
+            user.id, inviter.id, inviter.invite_code, result.status,
+        )
+        return BindInviteOut(
+            status=result.status,
+            coins_awarded=result.invitee_coin,
+            message=_BIND_MESSAGES.get(result.status, result.status),
+        )
+
+    # 路径 3:啥都没传 → 无效请求
     return BindInviteOut(
-        status=result.status,
-        coins_awarded=result.invitee_coin,
-        message=_BIND_MESSAGES.get(result.status, result.status),
+        status="invalid_code",
+        coins_awarded=0,
+        message=_BIND_MESSAGES["invalid_code"],
     )

app/api/v1/signin.py

@@ -12,7 +12,9 @@ import logging
 from fastapi import APIRouter, HTTPException, status
 
 from app.api.deps import CurrentUser, DbSession
+from app.repositories import ad_reward as crud_ad
 from app.repositories import signin as crud_signin
+from app.repositories import wallet as crud_wallet
 from app.schemas.welfare import (
     SigninBoostRequest,
     SigninBoostResultOut,
@@ -54,14 +56,21 @@ def do_signin(user: CurrentUser, db: DbSession) -> SigninResultOut:
 def boost_signin(
     payload: SigninBoostRequest, user: CurrentUser, db: DbSession
 ) -> SigninBoostResultOut:
-    try:
-        record, balance = crud_signin.boost_today_signin(
-            db, user.id, ad_ref_id=payload.ad_ref_id
-        )
-    except crud_signin.NotSignedTodayError as e:
-        raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail="not signed today") from e
-    except crud_signin.AlreadyBoostedError as e:
-        raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail="already boosted today") from e
+    if not payload.ad_ref_id:
+        raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail="ad reward required")
+    ad_rec = crud_ad.find_by_trans(db, payload.ad_ref_id)
+    if (
+        ad_rec is None
+        or ad_rec.user_id != user.id
+        or ad_rec.reward_scene != "signin_boost"
+        or ad_rec.status != "granted"
+    ):
+        raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail="ad reward not verified")
+    record = crud_signin.boost_by_ad_ref(db, user.id, payload.ad_ref_id)
+    if record is None:
+        raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail="signin boost not granted")
+    acc = crud_wallet.get_or_create_account(db, user.id)
+    balance = acc.coin_balance
 
     logger.info(
         "signin boost ok user_id=%d date=%s coin=%d",

app/api/v1/wallet.py

@@ -176,7 +176,7 @@ def withdraw_info(user: CurrentUser, db: DbSession) -> WithdrawInfoOut:
     "/withdraw",
     response_model=WithdrawResultOut,
     summary="发起提现(扣款建单,待人工审核;审核通过后才打款)",
-    dependencies=[Depends(rate_limit(20, 60, "withdraw"))],  # #6 同 IP 每分钟≤20 次
+    dependencies=[Depends(rate_limit(5, 60, "withdraw"))],  # IP 级粗限流;用户级未完成单限制在仓库层
 )
 def withdraw(req: WithdrawRequest, user: CurrentUser, db: DbSession) -> WithdrawResultOut:
     # 提现发起本身不调微信(打款在审核通过后),但仍要求微信支付已配置——否则审核通过也打不了款,提前拦
@@ -189,12 +189,17 @@ def withdraw(req: WithdrawRequest, user: CurrentUser, db: DbSession) -> Withdraw
     except crud_wallet.InvalidWithdrawAmountError as e:
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
-            detail=f"amount_cents must be within [{WITHDRAW_MIN_CENTS}, {WITHDRAW_MAX_CENTS}]",
+            detail="提现金额不符合要求",
         ) from e
     except crud_wallet.WechatNotBoundError as e:
-        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="wechat not bound") from e
+        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="请先绑定微信") from e
+    except crud_wallet.WithdrawTooFrequentError as e:
+        raise HTTPException(
+            status_code=status.HTTP_409_CONFLICT,
+            detail="已有提现申请正在审核或打款中,请处理完成后再申请",
+        ) from e
     except crud_wallet.InsufficientCashError as e:
-        raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail="insufficient cash balance") from e
+        raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail="现金余额不足") from e
 
     # 调试直发(非生产):skip_review=true 时跳过人工审核,立即发起微信转账(等价 admin approve)。
     # 双闸保护——客户端仅 debug 包下发此 flag,服务端仅非 prod 才认;任一道闸拦住即恢复正常审核,