From 0cf5b3816ff93fc8010d7d5d987f2e4c4a3d36b2 Mon Sep 17 00:00:00 2001 From: liujiahui Date: Thu, 9 Jul 2026 10:03:09 +0800 Subject: [PATCH] =?UTF-8?q?feat(coin-history):=20=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=B5=81=E5=B9=BF=E5=91=8A=E5=A5=96=E5=8A=B1=E6=8C=89=E7=82=B9?= =?UTF-8?q?=E4=BD=8D=E5=9C=BA=E6=99=AF=E6=8B=86=E6=B5=81=E6=B0=B4=E6=96=87?= =?UTF-8?q?=E6=A1=88(=E6=AF=94=E4=BB=B7/=E9=A2=86=E5=88=B8)=20(#124)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## 改动 `grant_feed_reward` 按 `feed_scene` 落不同 `biz_type`/`remark`,让收益明细里比价等候期看的广告与领券时看的广告文案分开: - `comparison` → `feed_ad_reward_comparison`(比价奖励) - `coupon` → `feed_ad_reward_coupon`(领券奖励) - 其余(welfare / 空 / 旧端不传)→ 维持通用 `feed_ad_reward`(信息流广告奖励) 客户端按 `biz_type` 直显固定文案(见 android 侧 `CoinHistoryViewModel.coinTitle`),`remark` 仅作后台留痕/兜底。 ## 附:验收脚手架 `scripts/seed_coinhistory_labels_test.py`(dev-only):往测试号 `11111111111` 塞每种 bizType 各一条金币流水(`ref_id` 前缀 `TESTDOC`),一屏核对收益明细全部新文案;`--clean` 按前缀精确清理,不污染真实数据。 ## 联动 客户端配套改动:`shaguabijia-app-android` 同名分支 `7-6ljh`。 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: no_gen_mu Reviewed-on: https://gitea.shaguabijia.com/WonderableAI/shaguabijia-app-server/pulls/124 Co-authored-by: liujiahui Co-committed-by: liujiahui --- app/repositories/ad_feed_reward.py | 13 +- scripts/seed_coinhistory_labels_test.py | 166 ++++++++++++++++++++++++ 2 files changed, 177 insertions(+), 2 deletions(-) create mode 100644 scripts/seed_coinhistory_labels_test.py diff --git a/app/repositories/ad_feed_reward.py b/app/repositories/ad_feed_reward.py index 6a8a29c..ea6ebc9 100644 --- a/app/repositories/ad_feed_reward.py +++ b/app/repositories/ad_feed_reward.py @@ -176,10 +176,19 @@ def grant_feed_reward( ) return _commit_record(db, rec, client_event_id) + # 按点位场景拆流水文案(2026-07):比价等候期看的广告 vs 领券时看的广告,在收益明细里分开显示。 + # feed_scene=comparison→比价奖励 / coupon→领券奖励;其它(welfare/空/旧端不带)维持通用「信息流广告奖励」。 + # 客户端按此 biz_type 直显固定文案(见 CoinHistoryViewModel.coinTitle),故 remark 只作后台留痕/兜底。 + if feed_scene == "comparison": + reward_biz, reward_remark = "feed_ad_reward_comparison", "比价奖励" + elif feed_scene == "coupon": + reward_biz, reward_remark = "feed_ad_reward_coupon", "领券奖励" + else: + reward_biz, reward_remark = "feed_ad_reward", "信息流广告奖励" crud_wallet.grant_coins( db, user_id, coin, - biz_type="feed_ad_reward", ref_id=client_event_id, - remark="信息流广告奖励", + biz_type=reward_biz, ref_id=client_event_id, + remark=reward_remark, ) rec = AdFeedRewardRecord( client_event_id=client_event_id, diff --git a/scripts/seed_coinhistory_labels_test.py b/scripts/seed_coinhistory_labels_test.py new file mode 100644 index 0000000..9de82c4 --- /dev/null +++ b/scripts/seed_coinhistory_labels_test.py @@ -0,0 +1,166 @@ +"""收益明细「金币记录」文案验证脚手架(2026-07 文案改版验收用)。 + +问题:客户端按 bizType 显示固定文案(路线B,强制覆盖后端 remark),但账号若没有对应 +bizType 的流水,收益明细页就空着,无从验证。本脚本往指定测试用户塞每种 bizType 各一条 +流水,让你在手机收益明细页一屏核对全部新文案;验收完 --clean 一键删除,不污染数据。 + +⚠️ 仅 dev 库用(APP_ENV=dev 时才允许 --seed/--clean)。所有测试流水 ref_id 前缀 TESTDOC, +按前缀精确清理,不会误删真实流水。 + +用法(pricebot env 直调,见项目 CLAUDE.md): + D:/miniconda/envs/pricebot/python.exe scripts/seed_coinhistory_labels_test.py --show + D:/miniconda/envs/pricebot/python.exe scripts/seed_coinhistory_labels_test.py --seed + D:/miniconda/envs/pricebot/python.exe scripts/seed_coinhistory_labels_test.py --clean +""" +from __future__ import annotations + +import argparse +import sys + +from app.core.config import settings +from app.core.rewards import CN_TZ +from datetime import datetime + +from app.db.session import SessionLocal +from app.models.user import User +from app.models.wallet import CoinAccount, CoinTransaction + +TEST_PHONE = "11111111111" +REF_PREFIX = "TESTDOC" # 所有本脚本造的流水都带这个 ref_id 前缀,便于精确清理 + +# 每条 = (bizType, 故意写错/留空的 remark, 金币数)。 +# remark 故意填「错的」→ 若客户端仍显示新文案 = 证明路线B强制覆盖生效(无视后端 remark)。 +# task_ 一条留空 remark → 走客户端兜底映射。顺序即手机上从新到旧的展示顺序(后塞的在最上)。 +CASES: list[tuple[str, str, int]] = [ + ("signin", "每日签到 第99天(旧文案,应被覆盖)", 220), + ("signin_boost", "签到膨胀 第99天", 3000), + ("reward_video", "看视频奖励金币(旧文案,应被覆盖)", 200), + ("feed_ad_reward_comparison", "", 50), # 后端新拆:比价场景 → 比价奖励 + ("feed_ad_reward_coupon", "", 50), # 后端新拆:领券场景 → 领券奖励 + ("feed_ad_reward", "信息流广告奖励(welfare/旧数据兜底)", 50), + ("price_report_reward", "上报更低价审核通过(旧文案,应被覆盖)", 1000), + ("feedback_reward", "意见反馈被采纳(旧文案,应被覆盖)", 10000), + ("task_enable_notification", "", 750), # remark 留空 → 客户端「打开消息提醒奖励」 + # 下两条现实中不会进金币记录(invite 发现金进邀请钱包 / compare_milestone 后端死代码不发钱), + # 仅用于验证「杀掉好友比价奖励 + 兜底改任务奖励」:两条都应显示「任务奖励」(remark 被强制无视)。 + ("invite", "好友比价奖励(旧文案,应被杀→任务奖励)", 200), + ("compare_milestone", "", 120), +] + + +def _client_coin_title(biz_type: str, remark: str | None) -> str: + """复刻 CoinHistoryViewModel.coinTitle 的最新逻辑(路线B),用于 --show 预览。 + + ⚠️ 必须与客户端保持一致;客户端改了这里也要同步,否则预览会骗人。 + """ + fixed = { + "exchange_out": "金币兑换现金", + "signin": "每日签到奖励", + "signin_boost": "签到膨胀奖励", + "reward_video": "看视频赚金币", + "ad_reward": "看视频赚金币", + "feed_ad_reward_comparison": "比价奖励", + "feed_ad_reward_coupon": "领券奖励", + "feed_ad_reward": "信息流广告奖励", + "price_report_reward": "爆料奖励", + "feedback_reward": "反馈奖励", + "invite": "任务奖励", # 杀掉"好友比价奖励",归兜底 + } + if biz_type in fixed: + return fixed[biz_type] + if remark: + return remark + if biz_type == "task_enable_notification": + return "打开消息提醒奖励" + return "任务奖励" + + +def _get_user(db) -> User: + u = db.query(User).filter(User.phone == TEST_PHONE).first() + if not u: + print(f"✗ 库里没有测试号 {TEST_PHONE} —— 先在手机上用这个号登录一次再跑本脚本。") + sys.exit(1) + return u + + +def cmd_show() -> None: + """只打印:每种 bizType 经客户端映射后会显示成什么(不写库)。""" + print("bizType 造流水后,收益明细页预期显示的文案:\n") + print(f" {'bizType':32} {'后端remark(故意填的)':32} → 手机显示") + print(" " + "-" * 90) + for biz, remark, _coin in CASES: + shown = _client_coin_title(biz, remark or None) + rk = (remark or "(空)") + print(f" {biz:32} {rk:32} → {shown}") + print("\n注:remark 列是故意填的『旧/错』文案;'手机显示'若为新文案 = 强制覆盖生效。") + print("invite / compare_milestone 已从客户端映射删除:invite 有 remark 故显示原样,") + print("compare_milestone remark 空故落兜底『奖励』—— 两者都不再有专属新文案(符合『去掉』)。") + + +def cmd_seed() -> None: + if settings.APP_ENV != "dev": + print(f"✗ 拒绝:APP_ENV={settings.APP_ENV},本脚本只在 dev 库造测试数据。") + sys.exit(1) + db = SessionLocal() + u = _get_user(db) + acc = db.query(CoinAccount).filter(CoinAccount.user_id == u.id).first() + if acc is None: + acc = CoinAccount(user_id=u.id, coin_balance=0, cash_balance_cents=0) + db.add(acc) + db.flush() + now = datetime.now(CN_TZ).replace(tzinfo=None) + made = 0 + for i, (biz, remark, coin) in enumerate(CASES): + ref = f"{REF_PREFIX}:{biz}:{i}" + exists = db.query(CoinTransaction).filter(CoinTransaction.ref_id == ref).first() + if exists: + continue + acc.coin_balance += coin + db.add(CoinTransaction( + user_id=u.id, amount=coin, balance_after=acc.coin_balance, + biz_type=biz, ref_id=ref, remark=remark or None, created_at=now, + )) + made += 1 + db.commit() + print(f"✓ 已给 user_id={u.id}({TEST_PHONE})造 {made} 条测试流水,当前金币余额 {acc.coin_balance}。") + print(" → 打开手机 App「收益明细 / 金币记录」下拉刷新,逐条核对文案。") + print(" → 验收完跑 --clean 删除这些测试流水。") + + +def cmd_clean() -> None: + if settings.APP_ENV != "dev": + print(f"✗ 拒绝:APP_ENV={settings.APP_ENV}。") + sys.exit(1) + db = SessionLocal() + u = _get_user(db) + rows = db.query(CoinTransaction).filter( + CoinTransaction.user_id == u.id, + CoinTransaction.ref_id.like(f"{REF_PREFIX}:%"), + ).all() + total = sum(r.amount for r in rows) + for r in rows: + db.delete(r) + acc = db.query(CoinAccount).filter(CoinAccount.user_id == u.id).first() + if acc is not None: + acc.coin_balance -= total # 把造流水时加的余额扣回,还原 + db.commit() + print(f"✓ 已删除 {len(rows)} 条 TESTDOC 测试流水,余额回扣 {total},当前 {acc.coin_balance if acc else 0}。") + + +def main() -> None: + ap = argparse.ArgumentParser(description="收益明细金币文案验证脚手架") + g = ap.add_mutually_exclusive_group(required=True) + g.add_argument("--show", action="store_true", help="只打印每种 bizType 的预期显示文案,不写库") + g.add_argument("--seed", action="store_true", help="往测试号造每种 bizType 各一条流水") + g.add_argument("--clean", action="store_true", help="删除本脚本造的所有测试流水") + args = ap.parse_args() + if args.show: + cmd_show() + elif args.seed: + cmd_seed() + elif args.clean: + cmd_clean() + + +if __name__ == "__main__": + main()