fix(ad): 广告配置默认信息流位 104090333 → 104142227

_AD_CONFIG_DEFAULTS 里 compare/coupon_feed_code_id 的旧默认 104090333
不在穿山甲应用 5830519 名下(请求报 44406「配置为 null」、出不了广告);
2026-06-21 真机核对后台,5830519 名下真实信息流位是 104142227「信息流 1」。

客户端接入 /api/v1/platform/ad-config 下发后会以此默认为准(空库回退),
故更正默认值。注:若 DB 里已存过 104090333,仍需在 admin 广告管理页改存为 104142227。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

.env.example

@@ -34,15 +34,6 @@ SMS_MOCK=true
 SMS_CODE_TTL_SEC=300
 SMS_SEND_INTERVAL_SEC=60
 
-# ===== 测试账号(release 包全流程联调用)=====
-# 配一个固定测试手机号,专供无 SIM 卡 / 不走一键登录时打通全流程:该号登录【免短信验证码】
-# (real 模式下也跳过校验)、每次登录【都重走新手引导】,并有【每日登录上限】防被人猜到号后脚本刷。
-# 逻辑见 app/core/test_account.py,与其他业务解耦。
-# ⚠️ 留空 = 关闭整功能(生产默认);要启用才填号(如 11111111111)。改完重启生效,随时可清空停用。
-TEST_ACCOUNT_PHONE=
-# 该测试号每日最多登录次数,当日超过即拒绝(429),次日归零。
-TEST_ACCOUNT_DAILY_LIMIT=500
-
 # ===== 美团联盟 CPS =====
 # 美团联盟后台 → 媒体管理 拿到的 appkey 和密钥
 MT_CPS_APP_KEY=

alembic/versions/feedback_review_fields.py

@@ -1,78 +0,0 @@
-"""feedback review fields
-
-Revision ID: feedback_review_fields
-Revises: ceb286289426
-Create Date: 2026-06-22 20:00:00.000000
-
-"""
-
-from collections.abc import Sequence
-
-import sqlalchemy as sa
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision: str = "feedback_review_fields"
-down_revision: str | Sequence[str] | None = "ceb286289426"
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-
-def upgrade() -> None:
-    with op.batch_alter_table("feedback", schema=None) as batch_op:
-        batch_op.add_column(sa.Column("reject_reason", sa.String(length=256), nullable=True))
-        batch_op.add_column(sa.Column("reward_coins", sa.Integer(), nullable=True))
-        batch_op.add_column(sa.Column("review_note", sa.String(length=256), nullable=True))
-        batch_op.add_column(sa.Column("reviewed_by_admin_id", sa.Integer(), nullable=True))
-        batch_op.add_column(sa.Column("reviewed_at", sa.DateTime(timezone=True), nullable=True))
-        batch_op.create_index(batch_op.f("ix_feedback_status"), ["status"], unique=False)
-        batch_op.create_foreign_key(
-            batch_op.f("fk_feedback_reviewed_by_admin_id_admin_user"),
-            "admin_user",
-            ["reviewed_by_admin_id"],
-            ["id"],
-        )
-
-    feedback = sa.table(
-        "feedback",
-        sa.column("status", sa.String(length=16)),
-    )
-    op.execute(
-        feedback.update()
-        .where(feedback.c.status == "new")
-        .values(status="pending")
-    )
-    op.execute(
-        feedback.update()
-        .where(feedback.c.status == "handled")
-        .values(status="adopted")
-    )
-
-
-def downgrade() -> None:
-    feedback = sa.table(
-        "feedback",
-        sa.column("status", sa.String(length=16)),
-    )
-    op.execute(
-        feedback.update()
-        .where(feedback.c.status == "pending")
-        .values(status="new")
-    )
-    op.execute(
-        feedback.update()
-        .where(feedback.c.status == "adopted")
-        .values(status="handled")
-    )
-
-    with op.batch_alter_table("feedback", schema=None) as batch_op:
-        batch_op.drop_constraint(
-            batch_op.f("fk_feedback_reviewed_by_admin_id_admin_user"),
-            type_="foreignkey",
-        )
-        batch_op.drop_index(batch_op.f("ix_feedback_status"))
-        batch_op.drop_column("reviewed_at")
-        batch_op.drop_column("reviewed_by_admin_id")
-        batch_op.drop_column("review_note")
-        batch_op.drop_column("reward_coins")
-        batch_op.drop_column("reject_reason")

app/admin/repositories/mutations.py

@@ -56,35 +56,6 @@ def update_feedback_status(
     return feedback
 
 
-def review_feedback(
-    db: Session,
-    feedback: Feedback,
-    *,
-    status: str,
-    reviewed_by_admin_id: int,
-    reward_coins: int | None = None,
-    reject_reason: str | None = None,
-    review_note: str | None = None,
-    commit: bool = True,
-) -> Feedback:
-    """审核反馈:置 adopted/rejected + 记录奖励/原因/审核人/审核时间。
-
-    发金币(wallet.grant_coins)由 router 在同一事务里调,确保状态、金币流水、审计一起提交。
-    """
-    feedback.status = status
-    feedback.reward_coins = reward_coins
-    feedback.reject_reason = reject_reason
-    feedback.review_note = review_note
-    feedback.reviewed_by_admin_id = reviewed_by_admin_id
-    feedback.reviewed_at = datetime.now(CN_TZ).replace(tzinfo=None)
-    if commit:
-        db.commit()
-        db.refresh(feedback)
-    else:
-        db.flush()
-    return feedback
-
-
 def review_price_report(
     db: Session,
     report: PriceReport,

app/admin/repositories/stats.py

@@ -119,7 +119,7 @@ def dashboard_overview(db: Session) -> dict:
             "success": comparison_success,
             "success_rate": success_rate,
         },
-        "feedback": {"new": _count(Feedback, Feedback.status.in_(("pending", "new")))},
+        "feedback": {"new": _count(Feedback, Feedback.status == "new")},
         # CPS 收入数据源未接(referral-link 只换链接,转化/佣金未回收)→ 前端显示"待接入"。
         "cps": {"available": False, "note": "CPS 转化数据未接入(P2)"},
     }

app/admin/routers/feedback.py

@@ -1,4 +1,4 @@
-"""admin 反馈工单:列表筛选 + 审核采纳/拒绝(带金币发放与审计)。"""
+"""admin 反馈工单:列表(读,支持 状态/用户ID/内容/时间 筛选 + 排序)+ 标记已处理(写,带审计)。"""
 from __future__ import annotations
 
 from datetime import datetime
@@ -10,10 +10,9 @@ from app.admin.audit import write_audit
 from app.admin.deps import AdminDb, get_client_ip, get_current_admin, require_role
 from app.admin.repositories import mutations, queries
 from app.admin.schemas.common import CursorPage, OkResponse
-from app.admin.schemas.feedback import FeedbackApproveRequest, FeedbackOut, FeedbackRejectRequest
+from app.admin.schemas.feedback import FeedbackOut
 from app.models.admin import AdminUser
 from app.models.feedback import Feedback
-from app.repositories import wallet as wallet_repo
 
 router = APIRouter(
     prefix="/admin/api/feedbacks",
@@ -22,11 +21,6 @@ router = APIRouter(
 )
 
 
-def _ensure_pending(fb: Feedback) -> None:
-    if fb.status not in {"pending", "new"}:
-        raise HTTPException(status_code=400, detail="反馈已审核")
-
-
 @router.get("", response_model=CursorPage[FeedbackOut], summary="反馈工单列表")
 def list_feedbacks(
     db: AdminDb,
@@ -62,104 +56,18 @@ def list_feedbacks(
 @router.post("/{feedback_id}/handle", response_model=OkResponse, summary="标记反馈已处理")
 def handle_feedback(
     feedback_id: int,
-    _admin: Annotated[AdminUser, Depends(require_role("operator"))],
+    request: Request,
+    admin: Annotated[AdminUser, Depends(require_role("operator"))],
     db: AdminDb,
 ) -> OkResponse:
     fb = db.get(Feedback, feedback_id)
     if fb is None:
         raise HTTPException(status_code=404, detail="反馈不存在")
-    raise HTTPException(status_code=400, detail="请使用采纳或拒绝接口审核反馈")
-
-
-@router.post("/{feedback_id}/approve", response_model=FeedbackOut, summary="采纳反馈并发金币")
-def approve_feedback(
-    feedback_id: int,
-    payload: FeedbackApproveRequest,
-    request: Request,
-    admin: Annotated[AdminUser, Depends(require_role("operator"))],
-    db: AdminDb,
-) -> FeedbackOut:
-    fb = db.get(Feedback, feedback_id)
-    if fb is None:
-        raise HTTPException(status_code=404, detail="反馈不存在")
-    _ensure_pending(fb)
-
     before = fb.status
-    mutations.review_feedback(
-        db,
-        fb,
-        status="adopted",
-        reward_coins=payload.reward_coins,
-        review_note=payload.note,
-        reviewed_by_admin_id=admin.id,
-        commit=False,
-    )
-    wallet_repo.grant_coins(
-        db,
-        fb.user_id,
-        payload.reward_coins,
-        biz_type="feedback_reward",
-        ref_id=str(fb.id),
-        remark="意见反馈被采纳",
-    )
+    mutations.update_feedback_status(db, fb, status="handled", commit=False)
     write_audit(
-        db,
-        admin,
-        action="feedback.approve",
-        target_type="feedback",
-        target_id=feedback_id,
-        detail={
-            "before": before,
-            "after": "adopted",
-            "reward_coins": payload.reward_coins,
-            "note": payload.note,
-        },
-        ip=get_client_ip(request),
-        commit=False,
+        db, admin, action="feedback.handle", target_type="feedback", target_id=feedback_id,
+        detail={"before": before, "after": "handled"}, ip=get_client_ip(request), commit=False,
     )
     db.commit()
-    db.refresh(fb)
-    return FeedbackOut.model_validate(fb)
-
-
-@router.post("/{feedback_id}/reject", response_model=FeedbackOut, summary="拒绝采纳反馈")
-def reject_feedback(
-    feedback_id: int,
-    payload: FeedbackRejectRequest,
-    request: Request,
-    admin: Annotated[AdminUser, Depends(require_role("operator"))],
-    db: AdminDb,
-) -> FeedbackOut:
-    fb = db.get(Feedback, feedback_id)
-    if fb is None:
-        raise HTTPException(status_code=404, detail="反馈不存在")
-    _ensure_pending(fb)
-
-    before = fb.status
-    mutations.review_feedback(
-        db,
-        fb,
-        status="rejected",
-        reject_reason=payload.reason,
-        review_note=payload.note,
-        reviewed_by_admin_id=admin.id,
-        commit=False,
-    )
-    write_audit(
-        db,
-        admin,
-        action="feedback.reject",
-        target_type="feedback",
-        target_id=feedback_id,
-        detail={
-            "before": before,
-            "after": "rejected",
-            "reason": payload.reason,
-            "note": payload.note,
-        },
-        ip=get_client_ip(request),
-        commit=False,
-    )
-    db.commit()
-    db.refresh(fb)
-    return FeedbackOut.model_validate(fb)
+    return OkResponse()

app/admin/schemas/feedback.py

@@ -3,9 +3,7 @@ from __future__ import annotations
 
 from datetime import datetime
 
-from pydantic import BaseModel, ConfigDict, Field
-
-from app.core.rewards import FEEDBACK_REWARD_MAX_COINS
+from pydantic import BaseModel, ConfigDict
 
 
 class FeedbackOut(BaseModel):
@@ -17,23 +15,4 @@ class FeedbackOut(BaseModel):
     contact: str
     images: list[str] | None = None
     status: str
-    reject_reason: str | None = None
-    reward_coins: int | None = None
-    review_note: str | None = None
-    reviewed_by_admin_id: int | None = None
-    reviewed_at: datetime | None = None
     created_at: datetime
-
-
-class FeedbackApproveRequest(BaseModel):
-    reward_coins: int = Field(
-        ge=1,
-        le=FEEDBACK_REWARD_MAX_COINS,
-        description="采纳后发放金币数",
-    )
-    note: str | None = Field(default=None, max_length=256, description="采纳要点/审核备注")
-
-
-class FeedbackRejectRequest(BaseModel):
-    reason: str = Field(min_length=1, max_length=256, description="未采纳原因,用户端可见")
-    note: str | None = Field(default=None, max_length=256, description="运营内部审核备注")

app/api/v1/auth.py

@@ -15,7 +15,6 @@ import logging
 from fastapi import APIRouter, Depends, HTTPException, status
 
 from app.api.deps import CurrentUser, DbSession
-from app.core import test_account
 from app.core.ratelimit import 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
@@ -39,17 +38,13 @@ logger = logging.getLogger("shagua.auth")
 router = APIRouter(prefix="/api/v1/auth", tags=["auth"])
 
 
-def _login_response(
-    user, *, onboarding_completed: bool, force_onboarding: bool = False
-) -> TokenWithUser:
-    """登录类接口共用的响应组装。onboarding_completed 据登录请求的 device_id 算好后传入;
-    force_onboarding 仅测试号置 True(让应用内重新登录也重走引导)。"""
+def _login_response(user, *, onboarding_completed: bool) -> TokenWithUser:
+    """登录类接口共用的响应组装。onboarding_completed 据登录请求的 device_id 算好后传入。"""
     tokens = issue_token_pair(user.id)
     return TokenWithUser(
         **tokens,
         user=UserOut.model_validate(user),
         onboarding_completed=onboarding_completed,
-        force_onboarding=force_onboarding,
     )
 
 
@@ -87,12 +82,6 @@ def jverify_login(req: JverifyLoginRequest, db: DbSession) -> TokenWithUser:
     dependencies=[Depends(rate_limit(10, 60, "sms-send"))],  # 同 IP 每分钟≤10 次(防一 IP 刷不同号)
 )
 def sms_send(req: SmsSendRequest) -> SmsSendResponse:
-    # 测试账号:不真发短信(号码非真实手机号,真发会失败/浪费),直接放行让客户端进入填码界面。
-    # 真正的"免验证码"在 /sms/login 跳过校验;每日上限也在 login 处算(send 不耗额度)。
-    if test_account.is_test_account(req.phone):
-        logger.info("test_account sms_send short-circuit (不真发)")
-        return SmsSendResponse(sent=True, mock=True, cooldown_sec=0)
-
     try:
         cooldown = send_code(req.phone)
     except SmsError as e:
@@ -110,19 +99,6 @@ def sms_send(req: SmsSendRequest) -> SmsSendResponse:
     dependencies=[Depends(rate_limit(20, 60, "sms-login"))],  # 防撞库爆破(另有单码失败次数上限)
 )
 def sms_login(req: SmsLoginRequest, db: DbSession) -> TokenWithUser:
-    # 测试账号:免验证码登录 + 每日上限 + 每次都走新手引导(详见 app/core/test_account.py)。
-    # 放在最前面:命中即不校验验证码;先扣当日额度,超限直接拒,挡住有人猜到号后脚本刷。
-    if test_account.is_test_account(req.phone):
-        if not test_account.try_consume_quota():
-            raise HTTPException(status_code=429, detail="测试账号今日使用次数已达上限,请明天再试")
-        user = user_repo.upsert_user_for_login(db, phone=req.phone, register_channel="sms")
-        if user.status != "active":
-            raise HTTPException(status_code=403, detail="account disabled")
-        logger.info("sms_login test_account ok user_id=%d phone=%s", user.id, mask_phone(req.phone))
-        # onboarding 恒 false + force_onboarding=true:每次登录都重走引导(含应用内退出后重登),
-        # 不读/不写 onboarding_completion 表。
-        return _login_response(user, onboarding_completed=False, force_onboarding=True)
-
     if not verify_code(req.phone, req.code):
         raise HTTPException(status_code=400, detail="invalid sms code")
 

app/api/v1/feedback.py

@@ -2,7 +2,6 @@
 
 路由前缀 `/api/v1/feedback`,需 Bearer 鉴权(反馈绑到登录用户,便于回访)。
   POST /  提交反馈(multipart:content 必填;contact 可选(原型改版后客户端已不再采集);images 可选 ≤6 张)
-  GET /records  我的反馈历史(pending/adopted/rejected)
 
 截图复用 [app.core.media] 落盘到 /media/feedback/。
 """
@@ -10,19 +9,13 @@ from __future__ import annotations
 
 import logging
 
-from fastapi import APIRouter, File, Form, HTTPException, Query, UploadFile
+from fastapi import APIRouter, File, Form, HTTPException, UploadFile
 
 from app.api.deps import CurrentUser, DbSession
 from app.core import media
 from app.repositories import feedback as feedback_repo
 from app.repositories import feedback_qr as feedback_qr_repo
-from app.schemas.feedback import (
-    FeedbackOut,
-    FeedbackQrConfigOut,
-    FeedbackRecordCountsOut,
-    FeedbackRecordOut,
-    FeedbackRecordsOut,
-)
+from app.schemas.feedback import FeedbackOut, FeedbackQrConfigOut
 
 logger = logging.getLogger("shagua.feedback")
 
@@ -31,27 +24,6 @@ router = APIRouter(prefix="/api/v1/feedback", tags=["feedback"])
 _MAX_IMAGES = 6
 _CONTENT_MAX = 200
 _CONTACT_MAX = 128
-_VALID_RECORD_STATUS = {"pending", "adopted", "rejected"}
-
-
-def _app_status(db_status: str) -> str:
-    return {
-        "new": "pending",
-        "handled": "adopted",
-        "approved": "adopted",
-    }.get(db_status, db_status)
-
-
-def _record_out(fb) -> FeedbackRecordOut:
-    return FeedbackRecordOut(
-        id=fb.id,
-        content=fb.content,
-        images=fb.images or [],
-        status=_app_status(fb.status),
-        reject_reason=getattr(fb, "reject_reason", None),
-        reward_coins=getattr(fb, "reward_coins", None),
-        created_at=fb.created_at,
-    )
 
 
 @router.post("", response_model=FeedbackOut, summary="提交反馈")
@@ -95,23 +67,3 @@ async def submit_feedback(
 def feedback_config(user: CurrentUser, db: DbSession) -> FeedbackQrConfigOut:
     """运营后台配的反馈页「加群二维码」卡(开关 + 二维码图 + 三行文案)。客户端进反馈页时拉取。"""
     return FeedbackQrConfigOut(**feedback_qr_repo.get_config(db))
-
-
-@router.get("/records", response_model=FeedbackRecordsOut, summary="我的反馈历史")
-def feedback_records(
-    user: CurrentUser,
-    db: DbSession,
-    status: str | None = Query(default=None),
-) -> FeedbackRecordsOut:
-    if status is not None and status not in _VALID_RECORD_STATUS:
-        raise HTTPException(status_code=400, detail="invalid status")
-
-    all_records = [_record_out(fb) for fb in feedback_repo.list_feedback(db, user_id=user.id)]
-    counts = FeedbackRecordCountsOut(
-        all=len(all_records),
-        pending=sum(1 for r in all_records if r.status == "pending"),
-        adopted=sum(1 for r in all_records if r.status == "adopted"),
-        rejected=sum(1 for r in all_records if r.status == "rejected"),
-    )
-    records = [r for r in all_records if r.status == status] if status else all_records
-    return FeedbackRecordsOut(records=records, counts=counts)

app/core/config.py

@@ -79,19 +79,6 @@ class Settings(BaseSettings):
     SMS_DAILY_LIMIT_PER_PHONE: int = 10   # 单手机号每日发送上限(防刷 + 控费)
     SMS_MAX_VERIFY_ATTEMPTS: int = 5      # 单个验证码最多校验失败次数,超过即作废(防爆破)
 
-    # ===== 测试账号(release 包全流程联调用)=====
-    # 配一个固定测试手机号,专供无 SIM 卡 / 不走一键登录时打通全流程:该号登录【免短信验证码】
-    # (real 模式下也跳过校验)、每次登录【强制重走新手引导】,并设【每日使用次数上限】防被人
-    # 猜到号后脚本滥用。两个值都能随时改 .env。逻辑全在 app/core/test_account.py,与其他业务解耦。
-    # ⚠️ TEST_ACCOUNT_PHONE 留空 = 整个功能关闭(生产默认安全;要启用才显式填号)。
-    TEST_ACCOUNT_PHONE: str = ""           # 测试手机号(11 位,如 11111111111);空=关闭整功能
-    TEST_ACCOUNT_DAILY_LIMIT: int = 500    # 该测试号每日最多登录次数,当日超过即拒绝登录
-
-    @property
-    def test_account_phone(self) -> str:
-        """规整后的测试手机号(去空白);空串=功能关闭。"""
-        return self.TEST_ACCOUNT_PHONE.strip()
-
     # ===== 美团联盟 CPS =====
     # 未配置时所有 /api/v1/meituan/* 接口 200 返空(优雅降级),不影响登录/领券等其他业务。
     MT_CPS_APP_KEY: str = ""

app/core/rewards.py

@@ -108,10 +108,6 @@ def record_milestone_reward(milestone: int) -> int:
 # 与广告/任务同量级;固定值(产品 2026-06 定),要调直接改这里;客户端记录页按 reward_coins 显示。
 PRICE_REPORT_REWARD_COINS: int = 1000
 
-# ===== 意见反馈采纳奖励(人工审核按质量发放)=====
-# 后台审核反馈时允许发放的单条金币上限。只做后端硬保护,具体档位由 admin-web 呈现。
-FEEDBACK_REWARD_MAX_COINS: int = 10000
-
 
 # ===== 邀请好友(注册即生效,邀请人 + 被邀请人各发金币)=====
 # 10000 金币 = 1 元,双方各得 1 元。MVP 先用固定常量(不走 app_config)。

app/core/test_account.py

@@ -1,80 +0,0 @@
-"""测试账号:免验证码登录 + 每次重走新手引导 + 每日使用上限。
-
-为打通 **release 包全流程**(无 SIM 卡、不走极光一键登录)而设的一个固定测试手机号。
-对这个号(且仅这个号)放开三件事:
-  1. **免短信验证码**:`/sms/send` 不真发、`/sms/login` 跳过 `verify_code`,real 模式下同样生效
-     —— 测试时直接填任意验证码即可登入,不用等真短信。
-  2. **每次都走新手引导**:登录响应 `onboarding_completed` 恒为 false,不读/不依赖
-     onboarding_completion 表,所以反复登录都能体验引导。
-  3. **每日使用次数上限**:防被人猜到这个号后写脚本一直刷。当天登录数超过上限即拒绝(429),
-     次日自动归零。
-
-手机号与上限都在 .env 配(`TEST_ACCOUNT_PHONE` / `TEST_ACCOUNT_DAILY_LIMIT`),随时可改。
-`TEST_ACCOUNT_PHONE` 留空 = 整个功能关闭(生产默认态),`is_test_account()` 对任何号都返回
-False,登录/短信回到原逻辑,零影响。
-
-计数存**进程内存**(单 worker 够用,与 sms.py 同款约定):重启清零、多 worker 不共享。作为
-一个测试号的粗粒度防滥用闸够用;且因所有登录都落同一个 phone → 同一个 user,滥用面天然只
-限于这一个账号。要严格持久化/跨进程再迁 DB 或 Redis(同 sms.py 的技术债)。
-"""
-from __future__ import annotations
-
-import logging
-from datetime import datetime
-from threading import Lock
-
-from app.core.config import settings
-
-logger = logging.getLogger("shagua.test_account")
-
-# 进程内每日计数:(date_str, 当日已登录次数)。单 worker 有效,重启清零(见模块 docstring)。
-_lock = Lock()
-_usage: tuple[str, int] = ("", 0)
-
-
-def _today() -> str:
-    return datetime.now().strftime("%Y-%m-%d")
-
-
-def is_enabled() -> bool:
-    """功能总开关:配了 TEST_ACCOUNT_PHONE 才启用(空=关闭)。"""
-    return bool(settings.test_account_phone)
-
-
-def is_test_account(phone: str) -> bool:
-    """该手机号是否为配置的测试账号。功能关闭时对任何号都返回 False。"""
-    return is_enabled() and phone == settings.test_account_phone
-
-
-def try_consume_quota() -> bool:
-    """测试账号登录时调:当日计数 +1。
-
-    Returns:
-        True  —— 未超当日上限,本次放行(计数已 +1);
-        False —— 已达上限,本次拒绝(计数不变)。
-
-    线程安全;跨天自动归零。上限取自 settings.TEST_ACCOUNT_DAILY_LIMIT(可在 .env 改)。
-    """
-    global _usage
-    limit = settings.TEST_ACCOUNT_DAILY_LIMIT
-    with _lock:
-        today = _today()
-        day, cnt = _usage
-        if day != today:  # 跨天归零
-            cnt = 0
-        if cnt >= limit:
-            _usage = (today, cnt)  # 已满,保持不变
-            logger.warning(
-                "测试账号 %s 今日登录数已达上限 %d,拒绝", settings.test_account_phone, limit
-            )
-            return False
-        _usage = (today, cnt + 1)
-        logger.info("测试账号 %s 第 %d/%d 次登录", settings.test_account_phone, cnt + 1, limit)
-        return True
-
-
-def _reset_for_test() -> None:
-    """仅供单测:清空进程内计数,隔离用例间状态。"""
-    global _usage
-    with _lock:
-        _usage = ("", 0)

app/models/feedback.py

@@ -2,7 +2,7 @@
 
 每条 = 用户一次提交。content 必填;contact 原为必填(微信/QQ/手机),原型改版后客户端不再采集,
 新数据存空串(列保持 NOT NULL,免迁移;历史数据仍有值);images 为可选的截图 URL 列表
-(/media/feedback/...,JSON 存)。status: pending(审核中)/adopted(已采纳)/rejected(未采纳)。
+(/media/feedback/...,JSON 存)。status: new(待处理)/ handled(已处理)。
 """
 from __future__ import annotations
 
@@ -25,18 +25,8 @@ class Feedback(Base):
     contact: Mapped[str] = mapped_column(String(128), nullable=False)
     # 截图 URL 列表(相对路径,如 ["/media/feedback/u1_ab12.jpg"]);无图为 None
     images: Mapped[list[str] | None] = mapped_column(JSON, nullable=True)
-    # pending(审核中) / adopted(已采纳) / rejected(未采纳)
-    status: Mapped[str] = mapped_column(String(16), nullable=False, default="pending", index=True)
-    reject_reason: Mapped[str | None] = mapped_column(String(256), nullable=True)
-    reward_coins: Mapped[int | None] = mapped_column(Integer, nullable=True)
-    # 审核批注:采纳时可写采纳要点,未采纳时也可保留运营侧备注
-    review_note: Mapped[str | None] = mapped_column(String(256), nullable=True)
-    reviewed_by_admin_id: Mapped[int | None] = mapped_column(
-        Integer, ForeignKey("admin_user.id"), nullable=True
-    )
-    reviewed_at: Mapped[datetime | None] = mapped_column(
-        DateTime(timezone=True), nullable=True
-    )
+    # new(待处理) / handled(已处理)
+    status: Mapped[str] = mapped_column(String(16), nullable=False, default="new")
 
     created_at: Mapped[datetime] = mapped_column(
         DateTime(timezone=True), server_default=func.now(), index=True, nullable=False

app/repositories/feedback.py

@@ -1,12 +1,8 @@
-"""feedback 表读写。"""
+"""feedback 表写入。"""
 from __future__ import annotations
 
-from datetime import datetime
-
-from sqlalchemy import select
 from sqlalchemy.orm import Session
 
-from app.core.rewards import CN_TZ
 from app.models.feedback import Feedback
 
 
@@ -23,19 +19,9 @@ def create_feedback(
         content=content,
         contact=contact,
         images=images or None,
-        status="pending",
-        created_at=datetime.now(CN_TZ).replace(tzinfo=None),
+        status="new",
     )
     db.add(fb)
     db.commit()
     db.refresh(fb)
     return fb
-
-
-def list_feedback(db: Session, *, user_id: int) -> list[Feedback]:
-    stmt = (
-        select(Feedback)
-        .where(Feedback.user_id == user_id)
-        .order_by(Feedback.created_at.desc(), Feedback.id.desc())
-    )
-    return list(db.execute(stmt).scalars().all())

app/schemas/auth.py

@@ -48,12 +48,6 @@ class TokenWithUser(TokenPair):
         description="该 设备+账号 是否已走完新手引导(据登录请求里的 device_id 计算)。"
         "true → 客户端登录后直接进首页,跳过引导。",
     )
-    force_onboarding: bool = Field(
-        False,
-        description="是否强制本次登录走新手引导(仅测试号置 true)。客户端据此让【应用内重新登录】"
-        "(退出后再登)也重走引导,普通号为 false、按原逻辑回原页/首页。与 onboarding_completed "
-        "分工:后者管 App 启动路由,本字段管应用内登录后的去向。",
-    )
 
 
 # ===== 极光一键登录 =====

app/schemas/feedback.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 
 from datetime import datetime
 
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import BaseModel, ConfigDict
 
 
 class FeedbackOut(BaseModel):
@@ -26,25 +26,3 @@ class FeedbackQrConfigOut(BaseModel):
     group_name: str
     subtitle: str
 
-
-class FeedbackRecordOut(BaseModel):
-    id: int
-    content: str
-    images: list[str] = Field(default_factory=list)
-    status: str
-    reject_reason: str | None = None
-    reward_coins: int | None = None
-    created_at: datetime
-
-
-class FeedbackRecordCountsOut(BaseModel):
-    all: int = 0
-    pending: int = 0
-    adopted: int = 0
-    rejected: int = 0
-
-
-class FeedbackRecordsOut(BaseModel):
-    records: list[FeedbackRecordOut]
-    counts: FeedbackRecordCountsOut
-

tests/test_admin_read.py

@@ -49,7 +49,7 @@ def _seed_user_with_data(phone: str) -> int:
         db.add(WithdrawOrder(
             user_id=uid, out_bill_no=f"test{uid}billno0001", amount_cents=100, status="success"
         ))
-        db.add(Feedback(user_id=uid, content="测试反馈内容", contact="wx_test", status="pending"))
+        db.add(Feedback(user_id=uid, content="测试反馈内容", contact="wx_test", status="new"))
         db.commit()
         return uid
     finally:
@@ -181,11 +181,9 @@ def test_wallet_and_withdraw_lists(admin_client: TestClient, admin_token: str) -
 
 def test_feedback_list(admin_client: TestClient, admin_token: str) -> None:
     _seed_user_with_data("13800000005")
-    r = admin_client.get(
-        "/admin/api/feedbacks", params={"status": "pending"}, headers=_auth(admin_token)
-    )
+    r = admin_client.get("/admin/api/feedbacks", params={"status": "new"}, headers=_auth(admin_token))
     assert r.status_code == 200
-    assert all(f["status"] == "pending" for f in r.json()["items"])
+    assert all(f["status"] == "new" for f in r.json()["items"])
 
 
 def test_ad_coin_audit_full_count_truncate_and_only_mismatch(

tests/test_admin_write.py

@@ -74,7 +74,7 @@ def _seed_feedback(phone: str) -> int:
     uid = _seed_user(phone)
     db = SessionLocal()
     try:
-        fb = Feedback(user_id=uid, content="测试", contact="wx", status="pending")
+        fb = Feedback(user_id=uid, content="测试", contact="wx", status="new")
         db.add(fb)
         db.commit()
         return fb.id
@@ -280,90 +280,15 @@ def test_super_admin_can_grant_coins(admin_client: TestClient, super_token: str)
     assert r.status_code == 200
 
 
-# ===== 反馈审核 =====
+# ===== 反馈处理 =====
 
-def test_approve_feedback_grants_coins_and_audit(
-    admin_client: TestClient, operator_token: str
-) -> None:
+def test_handle_feedback(admin_client: TestClient, operator_token: str) -> None:
     fid = _seed_feedback("13900000006")
-    r = admin_client.post(
-        f"/admin/api/feedbacks/{fid}/approve",
-        json={"reward_coins": 800, "note": "真实详细,已采纳"},
-        headers=_auth(operator_token),
-    )
-    assert r.status_code == 200, r.text
-    assert r.json()["status"] == "adopted"
-    assert r.json()["reward_coins"] == 800
+    r = admin_client.post(f"/admin/api/feedbacks/{fid}/handle", headers=_auth(operator_token))
+    assert r.status_code == 200
     db = SessionLocal()
     try:
-        fb = db.get(Feedback, fid)
-        assert fb is not None
-        assert fb.status == "adopted"
-        assert fb.reward_coins == 800
-        assert fb.review_note == "真实详细,已采纳"
-        assert fb.reviewed_by_admin_id is not None
-        assert fb.reviewed_at is not None
-        assert db.get(CoinAccount, fb.user_id).coin_balance == 800
-        txns = db.execute(
-            select(CoinTransaction).where(
-                CoinTransaction.user_id == fb.user_id,
-                CoinTransaction.biz_type == "feedback_reward",
-                CoinTransaction.ref_id == str(fid),
-            )
-        ).scalars().all()
-        assert len(txns) == 1 and txns[0].amount == 800
-        logs = db.execute(
-            select(AdminAuditLog).where(
-                AdminAuditLog.action == "feedback.approve",
-                AdminAuditLog.target_id == str(fid),
-            )
-        ).scalars().all()
-        assert len(logs) == 1 and logs[0].detail["reward_coins"] == 800
-    finally:
-        db.close()
-
-    r = admin_client.post(
-        f"/admin/api/feedbacks/{fid}/approve",
-        json={"reward_coins": 100},
-        headers=_auth(operator_token),
-    )
-    assert r.status_code == 400
-
-
-def test_reject_feedback_records_reason_and_no_coin(
-    admin_client: TestClient, operator_token: str
-) -> None:
-    fid = _seed_feedback("13900000013")
-    r = admin_client.post(
-        f"/admin/api/feedbacks/{fid}/reject",
-        json={"reason": "暂未提供可复现信息", "note": "信息不足"},
-        headers=_auth(operator_token),
-    )
-    assert r.status_code == 200, r.text
-    assert r.json()["status"] == "rejected"
-    assert r.json()["reject_reason"] == "暂未提供可复现信息"
-    db = SessionLocal()
-    try:
-        fb = db.get(Feedback, fid)
-        assert fb is not None
-        assert fb.status == "rejected"
-        assert fb.reject_reason == "暂未提供可复现信息"
-        assert fb.review_note == "信息不足"
-        txns = db.execute(
-            select(CoinTransaction).where(
-                CoinTransaction.user_id == fb.user_id,
-                CoinTransaction.biz_type == "feedback_reward",
-                CoinTransaction.ref_id == str(fid),
-            )
-        ).scalars().all()
-        assert txns == []
-        logs = db.execute(
-            select(AdminAuditLog).where(
-                AdminAuditLog.action == "feedback.reject",
-                AdminAuditLog.target_id == str(fid),
-            )
-        ).scalars().all()
-        assert len(logs) == 1 and logs[0].detail["reason"] == "暂未提供可复现信息"
+        assert db.get(Feedback, fid).status == "handled"
     finally:
         db.close()
 

tests/test_feedback.py

@@ -1,77 +0,0 @@
-"""用户反馈接口测试。"""
-from __future__ import annotations
-
-from app.db.session import SessionLocal
-from app.models.feedback import Feedback
-from app.repositories import user as user_repo
-
-
-def _login(client, phone: str) -> str:
-    client.post("/api/v1/auth/sms/send", json={"phone": phone})
-    r = client.post("/api/v1/auth/sms/login", json={"phone": phone, "code": "123456"})
-    assert r.status_code == 200, r.text
-    return r.json()["access_token"]
-
-
-def test_feedback_records_empty_returns_200(client) -> None:
-    token = _login(client, "13622000001")
-
-    r = client.get("/api/v1/feedback/records", headers={"Authorization": f"Bearer {token}"})
-
-    assert r.status_code == 200, r.text
-    assert r.json() == {
-        "records": [],
-        "counts": {"all": 0, "pending": 0, "adopted": 0, "rejected": 0},
-    }
-
-
-def test_feedback_config_returns_default(client) -> None:
-    token = _login(client, "13622000002")
-
-    r = client.get("/api/v1/feedback/config", headers={"Authorization": f"Bearer {token}"})
-
-    assert r.status_code == 200, r.text
-    body = r.json()
-    assert body["enabled"] is True
-    assert body["group_name"] == "傻瓜比价官方群"
-
-
-def test_feedback_records_maps_existing_statuses(client) -> None:
-    phone = "13622000003"
-    token = _login(client, phone)
-
-    db = SessionLocal()
-    try:
-        user = user_repo.get_user_by_phone(db, phone)
-        assert user is not None
-        db.add(Feedback(user_id=user.id, content="待处理反馈", contact="", status="pending"))
-        db.add(
-            Feedback(
-                user_id=user.id,
-                content="已采纳反馈",
-                contact="",
-                status="adopted",
-                reward_coins=800,
-            )
-        )
-        db.add(
-            Feedback(
-                user_id=user.id,
-                content="未采纳反馈",
-                contact="",
-                status="rejected",
-                reject_reason="暂未提供可复现信息",
-            )
-        )
-        db.commit()
-    finally:
-        db.close()
-
-    r = client.get("/api/v1/feedback/records", headers={"Authorization": f"Bearer {token}"})
-
-    assert r.status_code == 200, r.text
-    body = r.json()
-    assert body["counts"] == {"all": 3, "pending": 1, "adopted": 1, "rejected": 1}
-    by_status = {item["status"]: item for item in body["records"]}
-    assert by_status["adopted"]["reward_coins"] == 800
-    assert by_status["rejected"]["reject_reason"] == "暂未提供可复现信息"

tests/test_test_account.py

@@ -1,165 +0,0 @@
-"""测试账号(app/core/test_account.py)行为测试。
-
-覆盖四件事:
-  - 免验证码登录(mock 与 real 模式都跳过校验);
-  - 每次登录都重走新手引导(onboarding_completed 恒 false,即便完成表已有记录);
-  - 每日登录上限(超过即 429),且只算 login、不算 send;
-  - 功能关闭(TEST_ACCOUNT_PHONE 留空)时对任何号都不生效,回到原逻辑。
-"""
-from __future__ import annotations
-
-import pytest
-
-from app.core import test_account
-from app.integrations import sms
-
-# 测试自注入的固定号:各用例用 monkeypatch 把它塞进 settings.TEST_ACCOUNT_PHONE,
-# 再断言行为。它与 .env 配的值【相互独立】——测试不读 .env(保证确定性 / CI 无 .env 也能跑),
-# 写成和 .env 同值只为直观;换任意 11 位号测试照样全过,二者无需保持一致。
-TEST_PHONE = "11111111111"
-
-
-@pytest.fixture()
-def enabled(monkeypatch):
-    """启用测试账号功能并清空当日计数;monkeypatch 与 _reset 保证用例间隔离。"""
-    monkeypatch.setattr(test_account.settings, "TEST_ACCOUNT_PHONE", TEST_PHONE)
-    test_account._reset_for_test()
-    yield
-    test_account._reset_for_test()
-
-
-# ============================ 开关 / 识别 ============================
-
-def test_disabled_when_phone_unset(monkeypatch) -> None:
-    """TEST_ACCOUNT_PHONE 留空 = 整功能关闭,对测试号也不特殊处理。"""
-    monkeypatch.setattr(test_account.settings, "TEST_ACCOUNT_PHONE", "")
-    assert test_account.is_enabled() is False
-    assert test_account.is_test_account(TEST_PHONE) is False
-
-
-def test_only_configured_phone_is_test_account(enabled) -> None:
-    assert test_account.is_test_account(TEST_PHONE) is True
-    assert test_account.is_test_account("13800138000") is False
-
-
-def test_phone_is_whitespace_trimmed(monkeypatch) -> None:
-    """.env 里手机号前后带空格也能正确识别。"""
-    monkeypatch.setattr(test_account.settings, "TEST_ACCOUNT_PHONE", f"  {TEST_PHONE}  ")
-    assert test_account.is_test_account(TEST_PHONE) is True
-
-
-# ============================ 免验证码 + 新手引导 ============================
-
-def test_login_skips_code_and_returns_tokens(client, enabled) -> None:
-    """测试号任意验证码即可登入(不用等真短信),拿到 JWT,onboarding 为 false。"""
-    r = client.post(
-        "/api/v1/auth/sms/login",
-        json={"phone": TEST_PHONE, "code": "000000", "device_id": "dev-a"},
-    )
-    assert r.status_code == 200, r.text
-    data = r.json()
-    assert data["user"]["phone"] == TEST_PHONE
-    assert data["user"]["register_channel"] == "sms"
-    assert data["onboarding_completed"] is False
-    assert data["force_onboarding"] is True   # 测试号:应用内重登也强制重走引导
-    assert "access_token" in data and "refresh_token" in data
-
-
-def test_onboarding_always_false_even_if_completed(client, enabled) -> None:
-    """即便 onboarding_completion 表已有 (该用户, 该设备) 记录,测试号再登仍返回 false。"""
-    from app.db.session import SessionLocal
-    from app.repositories import onboarding as onboarding_repo
-
-    device = "dev-onb"
-    r = client.post(
-        "/api/v1/auth/sms/login",
-        json={"phone": TEST_PHONE, "code": "123456", "device_id": device},
-    )
-    uid = r.json()["user"]["id"]
-
-    db = SessionLocal()
-    try:
-        onboarding_repo.mark_completed(db, user_id=uid, device_id=device)
-        assert onboarding_repo.is_completed(db, user_id=uid, device_id=device) is True
-    finally:
-        db.close()
-
-    r2 = client.post(
-        "/api/v1/auth/sms/login",
-        json={"phone": TEST_PHONE, "code": "123456", "device_id": device},
-    )
-    assert r2.json()["onboarding_completed"] is False  # 仍重走引导
-
-
-# ============================ real 模式跳过 ============================
-
-def test_login_skips_verify_in_real_mode(client, enabled, monkeypatch) -> None:
-    """real 模式(SMS_MOCK=false)普通号要真校验;测试号必须跳过 → 任意码仍 200。"""
-    monkeypatch.setattr(sms.settings, "SMS_MOCK", False)
-    r = client.post(
-        "/api/v1/auth/sms/login",
-        json={"phone": TEST_PHONE, "code": "9999"},
-    )
-    assert r.status_code == 200, r.text
-
-
-def test_send_short_circuits_in_real_mode(client, enabled, monkeypatch) -> None:
-    """real 模式下测试号 /sms/send 不真打极光(否则缺号/缺 key 会 503),直接 200 放行进填码界面。"""
-    monkeypatch.setattr(sms.settings, "SMS_MOCK", False)
-    r = client.post("/api/v1/auth/sms/send", json={"phone": TEST_PHONE})
-    assert r.status_code == 200, r.text
-    body = r.json()
-    assert body["sent"] is True
-    assert body["cooldown_sec"] == 0
-
-
-# ============================ 每日上限 ============================
-
-def test_daily_limit_blocks_after_threshold(client, enabled, monkeypatch) -> None:
-    """当日登录数到上限后再登 → 429。"""
-    monkeypatch.setattr(test_account.settings, "TEST_ACCOUNT_DAILY_LIMIT", 2)
-    test_account._reset_for_test()
-
-    for _ in range(2):
-        r = client.post("/api/v1/auth/sms/login", json={"phone": TEST_PHONE, "code": "123456"})
-        assert r.status_code == 200, r.text
-
-    r = client.post("/api/v1/auth/sms/login", json={"phone": TEST_PHONE, "code": "123456"})
-    assert r.status_code == 429
-    assert "上限" in r.json()["detail"]
-
-
-def test_send_does_not_consume_quota(client, enabled, monkeypatch) -> None:
-    """额度只算 login、不算 send:狂发 send 后那唯一一次 login 仍能成功。"""
-    monkeypatch.setattr(test_account.settings, "TEST_ACCOUNT_DAILY_LIMIT", 1)
-    test_account._reset_for_test()
-
-    for _ in range(3):
-        assert client.post("/api/v1/auth/sms/send", json={"phone": TEST_PHONE}).status_code == 200
-
-    assert client.post("/api/v1/auth/sms/login", json={"phone": TEST_PHONE, "code": "1234"}).status_code == 200
-    # 第二次 login 才超限
-    assert client.post("/api/v1/auth/sms/login", json={"phone": TEST_PHONE, "code": "1234"}).status_code == 429
-
-
-# ============================ 计数单元逻辑 ============================
-
-def test_quota_resets_across_day(enabled, monkeypatch) -> None:
-    """跨天自动归零。"""
-    monkeypatch.setattr(test_account.settings, "TEST_ACCOUNT_DAILY_LIMIT", 1)
-    monkeypatch.setattr(test_account, "_today", lambda: "2026-06-23")
-    assert test_account.try_consume_quota() is True
-    assert test_account.try_consume_quota() is False  # 当天超限
-
-    monkeypatch.setattr(test_account, "_today", lambda: "2026-06-24")
-    assert test_account.try_consume_quota() is True   # 次日归零放行
-
-
-def test_non_test_phone_unaffected_when_enabled(client, enabled) -> None:
-    """功能开启时,普通号走原 mock 流程(任意 6 位通过),不受测试号逻辑影响。"""
-    phone = "13812341234"
-    client.post("/api/v1/auth/sms/send", json={"phone": phone})
-    r = client.post("/api/v1/auth/sms/login", json={"phone": phone, "code": "123456", "device_id": "d1"})
-    assert r.status_code == 200, r.text
-    assert r.json()["user"]["phone"] == phone
-    assert r.json()["force_onboarding"] is False   # 普通号不强制重走,按原逻辑