From 6ec4cfb4be41f382bac9f20d5440a84bc5b5c6f5 Mon Sep 17 00:00:00 2001 From: guke Date: Tue, 7 Jul 2026 17:46:09 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix(dashboard):=20=E6=AF=94=E4=BB=B7/?= =?UTF-8?q?=E9=A2=86=E5=88=B8=E5=A5=96=E5=8A=B1=E9=87=91=E5=B8=81=E6=8C=89?= =?UTF-8?q?=20feed=5Fscene=20=E6=B1=87=E6=80=BB(=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=81=92=200=20+=20=E6=BF=80=E5=8A=B1=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E5=8F=8C=E8=AE=A1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 比价/领券奖励金币此前查 coin_transaction.biz_type in (comparison/coupon...), 但这些 biz_type 全站从未写入——比价/领券信息流广告金币实际记为 feed_ad_reward、 场景区分在 ad_feed_reward_record.feed_scene——故两卡恒 0;领券桶还误含 reward_video/ad_reward,把激励视频金币双计进领券。 改为:comparison/coupon 奖励金币 = biz_type 桶(历史空、留作兜底)+ 按 ad_feed_reward_record.feed_scene 的 granted 实发金币(reward_date 北京自然日窗口); reward_video/ad_reward 拆成独立 REWARD_VIDEO_BIZ_TYPES,不再混入领券, REGULAR_TASK_EXCLUDED_BIZ_TYPES 保持不变。 测试:tests/test_admin_read.py 加 3 个用例(比价/领券按 feed_scene 汇总、 too_short 不计、领券排除激励视频);全量 pytest 除 5 个既有失败外全绿。 Co-Authored-By: Claude Opus 4.8 (1M context) --- app/admin/repositories/stats.py | 26 ++++++++-- tests/test_admin_read.py | 89 +++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 3 deletions(-) diff --git a/app/admin/repositories/stats.py b/app/admin/repositories/stats.py index 42e7998..260c159 100644 --- a/app/admin/repositories/stats.py +++ b/app/admin/repositories/stats.py @@ -30,11 +30,17 @@ from app.models.user import User from app.models.wallet import CoinTransaction, WithdrawOrder _BEIJING = timezone(timedelta(hours=8)) -COUPON_REWARD_BIZ_TYPES = ("reward_video", "ad_reward", "coupon", "coupon_reward") +REWARD_VIDEO_BIZ_TYPES = ("reward_video", "ad_reward") +# 领券/比价奖励金币的真实来源是信息流广告发奖(ad_feed_reward_record,按 feed_scene 分场景); +# coin_transaction 里只有扁平的 feed_ad_reward、biz_type 不分 coupon/comparison,故这俩桶历史从未 +# 被写入,仅留作未来兜底,实际金额在下方按 feed_scene 汇总 ad_feed_reward_record 得出。reward_video/ +# ad_reward 是激励视频,单独成桶、不再混进领券奖励(历史误并会把激励视频金币双计进领券)。 +COUPON_REWARD_BIZ_TYPES = ("coupon", "coupon_reward") COMPARISON_REWARD_BIZ_TYPES = ("comparison", "compare_reward", "comparison_reward") EXCLUDED_REWARD_BIZ_TYPES = ("invite_inviter", "invite_invitee", "admin_grant") UNCLASSIFIED_FEED_BIZ_TYPES = ("feed_ad_reward",) REGULAR_TASK_EXCLUDED_BIZ_TYPES = ( + *REWARD_VIDEO_BIZ_TYPES, *COUPON_REWARD_BIZ_TYPES, *COMPARISON_REWARD_BIZ_TYPES, *EXCLUDED_REWARD_BIZ_TYPES, @@ -362,7 +368,7 @@ def dashboard_overview( period_reward_video_coin_total = _sum( CoinTransaction.amount, *period_coin_conds, - CoinTransaction.biz_type.in_(("reward_video", "ad_reward")), + CoinTransaction.biz_type.in_(REWARD_VIDEO_BIZ_TYPES), ) period_feed_ad_coin_total = _sum( CoinTransaction.amount, @@ -384,15 +390,29 @@ def dashboard_overview( *period_coin_conds, CoinTransaction.biz_type.like("task_%"), ) + # 领券/比价奖励金币 = biz_type 桶(历史空,兜底)+ 该场景信息流广告实发金币 + # (ad_feed_reward_record.feed_scene,granted;reward_date 是北京日期串,与 period 同自然日窗口)。 period_coupon_reward_coin_total = _sum( CoinTransaction.amount, *period_coin_conds, CoinTransaction.biz_type.in_(COUPON_REWARD_BIZ_TYPES), + ) + _sum( + AdFeedRewardRecord.coin, + AdFeedRewardRecord.status == "granted", + AdFeedRewardRecord.feed_scene == "coupon", + AdFeedRewardRecord.reward_date >= period_from.isoformat(), + AdFeedRewardRecord.reward_date <= period_to.isoformat(), ) period_comparison_reward_coin_total = _sum( CoinTransaction.amount, *period_coin_conds, CoinTransaction.biz_type.in_(COMPARISON_REWARD_BIZ_TYPES), + ) + _sum( + AdFeedRewardRecord.coin, + AdFeedRewardRecord.status == "granted", + AdFeedRewardRecord.feed_scene == "comparison", + AdFeedRewardRecord.reward_date >= period_from.isoformat(), + AdFeedRewardRecord.reward_date <= period_to.isoformat(), ) period_regular_task_coin_total = _sum( CoinTransaction.amount, @@ -543,7 +563,7 @@ def dashboard_overview( "reward_video_coin_total": _sum( CoinTransaction.amount, CoinTransaction.amount > 0, - CoinTransaction.biz_type.in_(("reward_video", "ad_reward")), + CoinTransaction.biz_type.in_(REWARD_VIDEO_BIZ_TYPES), ), "reward_video_watch_count": _count( AdRewardRecord, diff --git a/tests/test_admin_read.py b/tests/test_admin_read.py index 1babd3c..5f5313f 100644 --- a/tests/test_admin_read.py +++ b/tests/test_admin_read.py @@ -320,3 +320,92 @@ def test_read_apis_require_auth(admin_client: TestClient) -> None: "/admin/api/feedbacks", ]: assert admin_client.get(path).status_code == 401, path + + +def test_period_comparison_reward_coin_from_feed_scene( + admin_client: TestClient, admin_token: str +) -> None: + """比价奖励金币口径:按 ad_feed_reward_record.feed_scene='comparison' 的实发金币 + (status=granted)汇总,而非查从不写入的 biz_type 桶(修复大盘该卡恒 0)。 + too_short(未发奖)不计。""" + from app.models.ad_feed_reward import AdFeedRewardRecord + + d = "2021-06-15" # 独立历史日,隔离其它用例数据 + db = SessionLocal() + try: + uid = user_repo.upsert_user_for_login(db, phone="13800008801", register_channel="sms").id + db.add(AdFeedRewardRecord( + client_event_id="cmp-fs-granted", user_id=uid, reward_date=d, + ecpm_raw="0", coin=123, feed_scene="comparison", status="granted", + )) + db.add(AdFeedRewardRecord( + client_event_id="cmp-fs-tooshort", user_id=uid, reward_date=d, + ecpm_raw="0", coin=99, feed_scene="comparison", status="too_short", + )) + db.commit() + finally: + db.close() + + r = admin_client.get( + "/admin/api/stats/overview", params={"date_from": d, "date_to": d}, + headers=_auth(admin_token), + ) + assert r.status_code == 200, r.text + assert r.json()["period"]["coins"]["comparison_reward_coin_total"] == 123 + + +def test_period_coupon_reward_coin_from_feed_scene( + admin_client: TestClient, admin_token: str +) -> None: + """领券奖励金币口径:按 ad_feed_reward_record.feed_scene='coupon' 的实发金币汇总。""" + from app.models.ad_feed_reward import AdFeedRewardRecord + + d = "2021-06-16" + db = SessionLocal() + try: + uid = user_repo.upsert_user_for_login(db, phone="13800008802", register_channel="sms").id + db.add(AdFeedRewardRecord( + client_event_id="cpn-fs-granted", user_id=uid, reward_date=d, + ecpm_raw="0", coin=456, feed_scene="coupon", status="granted", + )) + db.commit() + finally: + db.close() + + r = admin_client.get( + "/admin/api/stats/overview", params={"date_from": d, "date_to": d}, + headers=_auth(admin_token), + ) + assert r.status_code == 200, r.text + assert r.json()["period"]["coins"]["coupon_reward_coin_total"] == 456 + + +def test_period_coupon_reward_excludes_reward_video( + admin_client: TestClient, admin_token: str +) -> None: + """领券奖励金币不再把激励视频金币算进来(reward_video/ad_reward 从领券桶拆出); + 激励视频仍单独计入 reward_video_coin_total。""" + from datetime import datetime + + from app.models.wallet import CoinTransaction + + d = "2021-06-17" + db = SessionLocal() + try: + uid = user_repo.upsert_user_for_login(db, phone="13800008803", register_channel="sms").id + db.add(CoinTransaction( + user_id=uid, amount=50, balance_after=50, biz_type="reward_video", + ref_id="rv-split-1", created_at=datetime(2021, 6, 17, 12, 0, 0), + )) + db.commit() + finally: + db.close() + + r = admin_client.get( + "/admin/api/stats/overview", params={"date_from": d, "date_to": d}, + headers=_auth(admin_token), + ) + assert r.status_code == 200, r.text + coins = r.json()["period"]["coins"] + assert coins["coupon_reward_coin_total"] == 0 # 激励视频不计入领券奖励 + assert coins["reward_video_coin_total"] == 50 # 仍计入激励视频卡 From e11ad9449c727d799a65a345303936fa2fddf1b2 Mon Sep 17 00:00:00 2001 From: guke Date: Tue, 7 Jul 2026 18:05:33 +0800 Subject: [PATCH 2/6] revert 6ec4cfb4be41f382bac9f20d5440a84bc5b5c6f5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit revert fix(dashboard): 比价/领券奖励金币按 feed_scene 汇总(修复恒 0 + 激励视频双计) 比价/领券奖励金币此前查 coin_transaction.biz_type in (comparison/coupon...), 但这些 biz_type 全站从未写入——比价/领券信息流广告金币实际记为 feed_ad_reward、 场景区分在 ad_feed_reward_record.feed_scene——故两卡恒 0;领券桶还误含 reward_video/ad_reward,把激励视频金币双计进领券。 改为:comparison/coupon 奖励金币 = biz_type 桶(历史空、留作兜底)+ 按 ad_feed_reward_record.feed_scene 的 granted 实发金币(reward_date 北京自然日窗口); reward_video/ad_reward 拆成独立 REWARD_VIDEO_BIZ_TYPES,不再混入领券, REGULAR_TASK_EXCLUDED_BIZ_TYPES 保持不变。 测试:tests/test_admin_read.py 加 3 个用例(比价/领券按 feed_scene 汇总、 too_short 不计、领券排除激励视频);全量 pytest 除 5 个既有失败外全绿。 Co-Authored-By: Claude Opus 4.8 (1M context) --- app/admin/repositories/stats.py | 26 ++-------- tests/test_admin_read.py | 89 --------------------------------- 2 files changed, 3 insertions(+), 112 deletions(-) diff --git a/app/admin/repositories/stats.py b/app/admin/repositories/stats.py index 260c159..42e7998 100644 --- a/app/admin/repositories/stats.py +++ b/app/admin/repositories/stats.py @@ -30,17 +30,11 @@ from app.models.user import User from app.models.wallet import CoinTransaction, WithdrawOrder _BEIJING = timezone(timedelta(hours=8)) -REWARD_VIDEO_BIZ_TYPES = ("reward_video", "ad_reward") -# 领券/比价奖励金币的真实来源是信息流广告发奖(ad_feed_reward_record,按 feed_scene 分场景); -# coin_transaction 里只有扁平的 feed_ad_reward、biz_type 不分 coupon/comparison,故这俩桶历史从未 -# 被写入,仅留作未来兜底,实际金额在下方按 feed_scene 汇总 ad_feed_reward_record 得出。reward_video/ -# ad_reward 是激励视频,单独成桶、不再混进领券奖励(历史误并会把激励视频金币双计进领券)。 -COUPON_REWARD_BIZ_TYPES = ("coupon", "coupon_reward") +COUPON_REWARD_BIZ_TYPES = ("reward_video", "ad_reward", "coupon", "coupon_reward") COMPARISON_REWARD_BIZ_TYPES = ("comparison", "compare_reward", "comparison_reward") EXCLUDED_REWARD_BIZ_TYPES = ("invite_inviter", "invite_invitee", "admin_grant") UNCLASSIFIED_FEED_BIZ_TYPES = ("feed_ad_reward",) REGULAR_TASK_EXCLUDED_BIZ_TYPES = ( - *REWARD_VIDEO_BIZ_TYPES, *COUPON_REWARD_BIZ_TYPES, *COMPARISON_REWARD_BIZ_TYPES, *EXCLUDED_REWARD_BIZ_TYPES, @@ -368,7 +362,7 @@ def dashboard_overview( period_reward_video_coin_total = _sum( CoinTransaction.amount, *period_coin_conds, - CoinTransaction.biz_type.in_(REWARD_VIDEO_BIZ_TYPES), + CoinTransaction.biz_type.in_(("reward_video", "ad_reward")), ) period_feed_ad_coin_total = _sum( CoinTransaction.amount, @@ -390,29 +384,15 @@ def dashboard_overview( *period_coin_conds, CoinTransaction.biz_type.like("task_%"), ) - # 领券/比价奖励金币 = biz_type 桶(历史空,兜底)+ 该场景信息流广告实发金币 - # (ad_feed_reward_record.feed_scene,granted;reward_date 是北京日期串,与 period 同自然日窗口)。 period_coupon_reward_coin_total = _sum( CoinTransaction.amount, *period_coin_conds, CoinTransaction.biz_type.in_(COUPON_REWARD_BIZ_TYPES), - ) + _sum( - AdFeedRewardRecord.coin, - AdFeedRewardRecord.status == "granted", - AdFeedRewardRecord.feed_scene == "coupon", - AdFeedRewardRecord.reward_date >= period_from.isoformat(), - AdFeedRewardRecord.reward_date <= period_to.isoformat(), ) period_comparison_reward_coin_total = _sum( CoinTransaction.amount, *period_coin_conds, CoinTransaction.biz_type.in_(COMPARISON_REWARD_BIZ_TYPES), - ) + _sum( - AdFeedRewardRecord.coin, - AdFeedRewardRecord.status == "granted", - AdFeedRewardRecord.feed_scene == "comparison", - AdFeedRewardRecord.reward_date >= period_from.isoformat(), - AdFeedRewardRecord.reward_date <= period_to.isoformat(), ) period_regular_task_coin_total = _sum( CoinTransaction.amount, @@ -563,7 +543,7 @@ def dashboard_overview( "reward_video_coin_total": _sum( CoinTransaction.amount, CoinTransaction.amount > 0, - CoinTransaction.biz_type.in_(REWARD_VIDEO_BIZ_TYPES), + CoinTransaction.biz_type.in_(("reward_video", "ad_reward")), ), "reward_video_watch_count": _count( AdRewardRecord, diff --git a/tests/test_admin_read.py b/tests/test_admin_read.py index 5f5313f..1babd3c 100644 --- a/tests/test_admin_read.py +++ b/tests/test_admin_read.py @@ -320,92 +320,3 @@ def test_read_apis_require_auth(admin_client: TestClient) -> None: "/admin/api/feedbacks", ]: assert admin_client.get(path).status_code == 401, path - - -def test_period_comparison_reward_coin_from_feed_scene( - admin_client: TestClient, admin_token: str -) -> None: - """比价奖励金币口径:按 ad_feed_reward_record.feed_scene='comparison' 的实发金币 - (status=granted)汇总,而非查从不写入的 biz_type 桶(修复大盘该卡恒 0)。 - too_short(未发奖)不计。""" - from app.models.ad_feed_reward import AdFeedRewardRecord - - d = "2021-06-15" # 独立历史日,隔离其它用例数据 - db = SessionLocal() - try: - uid = user_repo.upsert_user_for_login(db, phone="13800008801", register_channel="sms").id - db.add(AdFeedRewardRecord( - client_event_id="cmp-fs-granted", user_id=uid, reward_date=d, - ecpm_raw="0", coin=123, feed_scene="comparison", status="granted", - )) - db.add(AdFeedRewardRecord( - client_event_id="cmp-fs-tooshort", user_id=uid, reward_date=d, - ecpm_raw="0", coin=99, feed_scene="comparison", status="too_short", - )) - db.commit() - finally: - db.close() - - r = admin_client.get( - "/admin/api/stats/overview", params={"date_from": d, "date_to": d}, - headers=_auth(admin_token), - ) - assert r.status_code == 200, r.text - assert r.json()["period"]["coins"]["comparison_reward_coin_total"] == 123 - - -def test_period_coupon_reward_coin_from_feed_scene( - admin_client: TestClient, admin_token: str -) -> None: - """领券奖励金币口径:按 ad_feed_reward_record.feed_scene='coupon' 的实发金币汇总。""" - from app.models.ad_feed_reward import AdFeedRewardRecord - - d = "2021-06-16" - db = SessionLocal() - try: - uid = user_repo.upsert_user_for_login(db, phone="13800008802", register_channel="sms").id - db.add(AdFeedRewardRecord( - client_event_id="cpn-fs-granted", user_id=uid, reward_date=d, - ecpm_raw="0", coin=456, feed_scene="coupon", status="granted", - )) - db.commit() - finally: - db.close() - - r = admin_client.get( - "/admin/api/stats/overview", params={"date_from": d, "date_to": d}, - headers=_auth(admin_token), - ) - assert r.status_code == 200, r.text - assert r.json()["period"]["coins"]["coupon_reward_coin_total"] == 456 - - -def test_period_coupon_reward_excludes_reward_video( - admin_client: TestClient, admin_token: str -) -> None: - """领券奖励金币不再把激励视频金币算进来(reward_video/ad_reward 从领券桶拆出); - 激励视频仍单独计入 reward_video_coin_total。""" - from datetime import datetime - - from app.models.wallet import CoinTransaction - - d = "2021-06-17" - db = SessionLocal() - try: - uid = user_repo.upsert_user_for_login(db, phone="13800008803", register_channel="sms").id - db.add(CoinTransaction( - user_id=uid, amount=50, balance_after=50, biz_type="reward_video", - ref_id="rv-split-1", created_at=datetime(2021, 6, 17, 12, 0, 0), - )) - db.commit() - finally: - db.close() - - r = admin_client.get( - "/admin/api/stats/overview", params={"date_from": d, "date_to": d}, - headers=_auth(admin_token), - ) - assert r.status_code == 200, r.text - coins = r.json()["period"]["coins"] - assert coins["coupon_reward_coin_total"] == 0 # 激励视频不计入领券奖励 - assert coins["reward_video_coin_total"] == 50 # 仍计入激励视频卡 From a43e0823911669571d0afd56fb23c67a50c3ee41 Mon Sep 17 00:00:00 2001 From: guke Date: Tue, 7 Jul 2026 18:29:23 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix(dashboard):=20=E6=AF=94=E4=BB=B7/?= =?UTF-8?q?=E9=A2=86=E5=88=B8=E5=A5=96=E5=8A=B1=E9=87=91=E5=B8=81=E6=8C=89?= =?UTF-8?q?=20feed=5Fscene=20=E6=B1=87=E6=80=BB(=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=81=92=200=20+=20=E6=BF=80=E5=8A=B1=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E5=8F=8C=E8=AE=A1)=20(#125)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 世睿之前mr未合并的逻辑 比价/领券奖励金币此前查 coin_transaction.biz_type in (comparison/coupon...), 但这些 biz_type 全站从未写入——比价/领券信息流广告金币实际记为 feed_ad_reward、 场景区分在 ad_feed_reward_record.feed_scene——故两卡恒 0;领券桶还误含 reward_video/ad_reward,把激励视频金币双计进领券。 改为:comparison/coupon 奖励金币 = biz_type 桶(历史空、留作兜底)+ 按 ad_feed_reward_record.feed_scene 的 granted 实发金币(reward_date 北京自然日窗口); reward_video/ad_reward 拆成独立 REWARD_VIDEO_BIZ_TYPES,不再混入领券, REGULAR_TASK_EXCLUDED_BIZ_TYPES 保持不变。 测试:tests/test_admin_read.py 加 3 个用例(比价/领券按 feed_scene 汇总、 too_short 不计、领券排除激励视频);全量 pytest 除 5 个既有失败外全绿。 Co-Authored-By: Claude Opus 4.8 (1M context) --------- Co-authored-by: guke Reviewed-on: https://gitea.shaguabijia.com/WonderableAI/shaguabijia-app-server/pulls/125 --- app/admin/repositories/stats.py | 26 ++++++++-- tests/test_admin_read.py | 89 +++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 3 deletions(-) diff --git a/app/admin/repositories/stats.py b/app/admin/repositories/stats.py index 42e7998..260c159 100644 --- a/app/admin/repositories/stats.py +++ b/app/admin/repositories/stats.py @@ -30,11 +30,17 @@ from app.models.user import User from app.models.wallet import CoinTransaction, WithdrawOrder _BEIJING = timezone(timedelta(hours=8)) -COUPON_REWARD_BIZ_TYPES = ("reward_video", "ad_reward", "coupon", "coupon_reward") +REWARD_VIDEO_BIZ_TYPES = ("reward_video", "ad_reward") +# 领券/比价奖励金币的真实来源是信息流广告发奖(ad_feed_reward_record,按 feed_scene 分场景); +# coin_transaction 里只有扁平的 feed_ad_reward、biz_type 不分 coupon/comparison,故这俩桶历史从未 +# 被写入,仅留作未来兜底,实际金额在下方按 feed_scene 汇总 ad_feed_reward_record 得出。reward_video/ +# ad_reward 是激励视频,单独成桶、不再混进领券奖励(历史误并会把激励视频金币双计进领券)。 +COUPON_REWARD_BIZ_TYPES = ("coupon", "coupon_reward") COMPARISON_REWARD_BIZ_TYPES = ("comparison", "compare_reward", "comparison_reward") EXCLUDED_REWARD_BIZ_TYPES = ("invite_inviter", "invite_invitee", "admin_grant") UNCLASSIFIED_FEED_BIZ_TYPES = ("feed_ad_reward",) REGULAR_TASK_EXCLUDED_BIZ_TYPES = ( + *REWARD_VIDEO_BIZ_TYPES, *COUPON_REWARD_BIZ_TYPES, *COMPARISON_REWARD_BIZ_TYPES, *EXCLUDED_REWARD_BIZ_TYPES, @@ -362,7 +368,7 @@ def dashboard_overview( period_reward_video_coin_total = _sum( CoinTransaction.amount, *period_coin_conds, - CoinTransaction.biz_type.in_(("reward_video", "ad_reward")), + CoinTransaction.biz_type.in_(REWARD_VIDEO_BIZ_TYPES), ) period_feed_ad_coin_total = _sum( CoinTransaction.amount, @@ -384,15 +390,29 @@ def dashboard_overview( *period_coin_conds, CoinTransaction.biz_type.like("task_%"), ) + # 领券/比价奖励金币 = biz_type 桶(历史空,兜底)+ 该场景信息流广告实发金币 + # (ad_feed_reward_record.feed_scene,granted;reward_date 是北京日期串,与 period 同自然日窗口)。 period_coupon_reward_coin_total = _sum( CoinTransaction.amount, *period_coin_conds, CoinTransaction.biz_type.in_(COUPON_REWARD_BIZ_TYPES), + ) + _sum( + AdFeedRewardRecord.coin, + AdFeedRewardRecord.status == "granted", + AdFeedRewardRecord.feed_scene == "coupon", + AdFeedRewardRecord.reward_date >= period_from.isoformat(), + AdFeedRewardRecord.reward_date <= period_to.isoformat(), ) period_comparison_reward_coin_total = _sum( CoinTransaction.amount, *period_coin_conds, CoinTransaction.biz_type.in_(COMPARISON_REWARD_BIZ_TYPES), + ) + _sum( + AdFeedRewardRecord.coin, + AdFeedRewardRecord.status == "granted", + AdFeedRewardRecord.feed_scene == "comparison", + AdFeedRewardRecord.reward_date >= period_from.isoformat(), + AdFeedRewardRecord.reward_date <= period_to.isoformat(), ) period_regular_task_coin_total = _sum( CoinTransaction.amount, @@ -543,7 +563,7 @@ def dashboard_overview( "reward_video_coin_total": _sum( CoinTransaction.amount, CoinTransaction.amount > 0, - CoinTransaction.biz_type.in_(("reward_video", "ad_reward")), + CoinTransaction.biz_type.in_(REWARD_VIDEO_BIZ_TYPES), ), "reward_video_watch_count": _count( AdRewardRecord, diff --git a/tests/test_admin_read.py b/tests/test_admin_read.py index 1babd3c..5f5313f 100644 --- a/tests/test_admin_read.py +++ b/tests/test_admin_read.py @@ -320,3 +320,92 @@ def test_read_apis_require_auth(admin_client: TestClient) -> None: "/admin/api/feedbacks", ]: assert admin_client.get(path).status_code == 401, path + + +def test_period_comparison_reward_coin_from_feed_scene( + admin_client: TestClient, admin_token: str +) -> None: + """比价奖励金币口径:按 ad_feed_reward_record.feed_scene='comparison' 的实发金币 + (status=granted)汇总,而非查从不写入的 biz_type 桶(修复大盘该卡恒 0)。 + too_short(未发奖)不计。""" + from app.models.ad_feed_reward import AdFeedRewardRecord + + d = "2021-06-15" # 独立历史日,隔离其它用例数据 + db = SessionLocal() + try: + uid = user_repo.upsert_user_for_login(db, phone="13800008801", register_channel="sms").id + db.add(AdFeedRewardRecord( + client_event_id="cmp-fs-granted", user_id=uid, reward_date=d, + ecpm_raw="0", coin=123, feed_scene="comparison", status="granted", + )) + db.add(AdFeedRewardRecord( + client_event_id="cmp-fs-tooshort", user_id=uid, reward_date=d, + ecpm_raw="0", coin=99, feed_scene="comparison", status="too_short", + )) + db.commit() + finally: + db.close() + + r = admin_client.get( + "/admin/api/stats/overview", params={"date_from": d, "date_to": d}, + headers=_auth(admin_token), + ) + assert r.status_code == 200, r.text + assert r.json()["period"]["coins"]["comparison_reward_coin_total"] == 123 + + +def test_period_coupon_reward_coin_from_feed_scene( + admin_client: TestClient, admin_token: str +) -> None: + """领券奖励金币口径:按 ad_feed_reward_record.feed_scene='coupon' 的实发金币汇总。""" + from app.models.ad_feed_reward import AdFeedRewardRecord + + d = "2021-06-16" + db = SessionLocal() + try: + uid = user_repo.upsert_user_for_login(db, phone="13800008802", register_channel="sms").id + db.add(AdFeedRewardRecord( + client_event_id="cpn-fs-granted", user_id=uid, reward_date=d, + ecpm_raw="0", coin=456, feed_scene="coupon", status="granted", + )) + db.commit() + finally: + db.close() + + r = admin_client.get( + "/admin/api/stats/overview", params={"date_from": d, "date_to": d}, + headers=_auth(admin_token), + ) + assert r.status_code == 200, r.text + assert r.json()["period"]["coins"]["coupon_reward_coin_total"] == 456 + + +def test_period_coupon_reward_excludes_reward_video( + admin_client: TestClient, admin_token: str +) -> None: + """领券奖励金币不再把激励视频金币算进来(reward_video/ad_reward 从领券桶拆出); + 激励视频仍单独计入 reward_video_coin_total。""" + from datetime import datetime + + from app.models.wallet import CoinTransaction + + d = "2021-06-17" + db = SessionLocal() + try: + uid = user_repo.upsert_user_for_login(db, phone="13800008803", register_channel="sms").id + db.add(CoinTransaction( + user_id=uid, amount=50, balance_after=50, biz_type="reward_video", + ref_id="rv-split-1", created_at=datetime(2021, 6, 17, 12, 0, 0), + )) + db.commit() + finally: + db.close() + + r = admin_client.get( + "/admin/api/stats/overview", params={"date_from": d, "date_to": d}, + headers=_auth(admin_token), + ) + assert r.status_code == 200, r.text + coins = r.json()["period"]["coins"] + assert coins["coupon_reward_coin_total"] == 0 # 激励视频不计入领券奖励 + assert coins["reward_video_coin_total"] == 50 # 仍计入激励视频卡 From 93cb283c1b39672d9a748b355334b1298061cbac Mon Sep 17 00:00:00 2001 From: zhuzihao Date: Wed, 8 Jul 2026 00:57:00 +0800 Subject: [PATCH 4/6] =?UTF-8?q?feat(marquee):=20=E7=9C=9F=E5=AE=9E?= =?UTF-8?q?=E6=9D=A1=E4=B8=8D=E6=8C=89=E7=94=A8=E6=88=B7=E5=8E=BB=E9=87=8D?= =?UTF-8?q?(=E6=89=93=E4=B9=B1+=E5=8E=BB=E8=BF=9E=E7=B0=87)+=20=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E6=8C=89=E6=A8=A1=E5=BC=8F=E5=88=86=E9=A1=B5=E6=B5=8F?= =?UTF-8?q?=E8=A7=88=E5=8F=AF=E5=B1=95=E7=A4=BA=E8=AE=B0=E5=BD=95=20(#123)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - get_feed 真实条不再按 user 去重:改「洗牌 + 去连簇」(相邻尽量不同用户、减少单人连刷), 同一用户可多条露出但被打散、尽量不连续。_shuffle_declustered 支持传入固定种子 rng。 - 新增 GET /admin/api/marquee-seeds/real-records:按**当前模式**分页浏览全部可展示记录(不去重), 供运营逐页审核——只真实=真实记录;只种子=各启用种子按生成逻辑各出一行;混播=真实+种子。 固定种子洗牌+去连簇 → 排列恒定、翻页稳定、能翻遍全部;含 OpsRealRecord* schema。 Co-Authored-By: Claude Opus 4.8 --------- Co-authored-by: zzhyyyyy <2685922758@qq.com> Reviewed-on: https://gitea.shaguabijia.com/WonderableAI/shaguabijia-app-server/pulls/123 Co-authored-by: zhuzihao Co-committed-by: zhuzihao --- app/admin/routers/ops_marquee_seed.py | 18 +++++ app/admin/schemas/ops_marquee_seed.py | 13 ++++ app/repositories/ops_marquee.py | 104 +++++++++++++++++++++++--- 3 files changed, 124 insertions(+), 11 deletions(-) diff --git a/app/admin/routers/ops_marquee_seed.py b/app/admin/routers/ops_marquee_seed.py index d1d053c..0b3ff04 100644 --- a/app/admin/routers/ops_marquee_seed.py +++ b/app/admin/routers/ops_marquee_seed.py @@ -19,6 +19,8 @@ from app.admin.schemas.ops_marquee_seed import ( OpsMarqueeSeedCreate, OpsMarqueeSeedOut, OpsMarqueeSeedUpdate, + OpsRealRecordItem, + OpsRealRecordsOut, OpsSavingsFeedPreviewOut, ) from app.models.admin import AdminUser @@ -68,6 +70,22 @@ def preview_feed( return OpsSavingsFeedPreviewOut(items=ops_marquee.get_feed(db, limit=limit, mode=mode)) +@router.get("/real-records", response_model=OpsRealRecordsOut, summary="分页浏览当前模式下可展示的记录(审核用)") +def list_real_records( + db: AdminDb, + mode: Annotated[str | None, Query(description="mixed/real/seed;不传=当前持久化模式")] = None, + offset: Annotated[int, Query(ge=0)] = 0, + limit: Annotated[int, Query(ge=1, le=50)] = 8, +) -> OpsRealRecordsOut: + """分页列出**当前模式**下可在 app 轮播展示的全部记录(**不去重**):只真实=真实记录;只种子=各启用 + 种子按生成逻辑各出一行;混播=真实+种子。与 app 同口径洗牌+去连簇,固定种子→翻页稳定、能翻遍全部。 + item.user_id=0 表示种子行。""" + if mode is not None and mode not in ops_marquee.FEED_MODES: + raise HTTPException(status_code=400, detail="mode 需为 mixed / real / seed") + items, total = ops_marquee.list_real_records(db, mode=mode, offset=offset, limit=limit) + return OpsRealRecordsOut(items=[OpsRealRecordItem(**it) for it in items], total=total) + + # 注:/mode 两个端点须在 /{seed_id} 之前注册,否则 PATCH /mode 会被 /{seed_id} 抢先按 id 解析。 @router.get("/mode", summary="首页轮播数据源模式(mixed/real/seed)") def get_feed_mode(db: AdminDb) -> dict: diff --git a/app/admin/schemas/ops_marquee_seed.py b/app/admin/schemas/ops_marquee_seed.py index db8c56d..acdf7b9 100644 --- a/app/admin/schemas/ops_marquee_seed.py +++ b/app/admin/schemas/ops_marquee_seed.py @@ -62,3 +62,16 @@ class OpsSavingsFeedPreviewItem(BaseModel): class OpsSavingsFeedPreviewOut(BaseModel): """运营预览:实际混播出来的 feed(真实记录会插队,与客户端一致)。""" items: list[OpsSavingsFeedPreviewItem] + + +class OpsRealRecordItem(BaseModel): + masked_user: str # 脱敏后展示名(与 app 一致) + saved_amount_cents: int # 节省金额(分) + created_at: str # 比价记录时间(YYYY-MM-DD HH:MM) + user_id: int # 真实 user_id(供运营核对,不下发客户端) + + +class OpsRealRecordsOut(BaseModel): + """分页浏览「全部可展示的真实记录」(success+省>0,不去重、稳定顺序)。""" + items: list[OpsRealRecordItem] + total: int # 满足条件的真实记录总数(算页数用) diff --git a/app/repositories/ops_marquee.py b/app/repositories/ops_marquee.py index abf2978..be5c1d3 100644 --- a/app/repositories/ops_marquee.py +++ b/app/repositories/ops_marquee.py @@ -217,12 +217,28 @@ def _recent_real_rows(db: Session) -> list[tuple[int, int, str | None]]: return out +def _shuffle_declustered(rows: list, rng: random.Random | None = None) -> list: + """洗牌 + 「去连簇」:先洗牌,再贪心重排让相邻两条尽量不是同一 user_id(元素 [0] 即 user_id)。 + rng=None → 用全局 _rng(feed 每次新随机);传入 rng(如固定种子 Random)→ 排列确定(admin 稳定分页)。 + 减少同一用户连续出现;只有少数几个用户时 best-effort。""" + rng = rng or _rng + pool = list(rows) + rng.shuffle(pool) + result: list = [] + while pool: + prev_uid = result[-1][0] if result else None + # 优先挑与上一条不同 user 的;挑不到(只剩同 user)才取第一个 + idx = next((i for i, r in enumerate(pool) if r[0] != prev_uid), 0) + result.append(pool.pop(idx)) + return result + + def get_feed(db: Session, limit: int = 8, mode: str | None = None) -> list[dict]: """返回最多 limit 条 {masked_user, saved_amount_cents, time(HH:MM:SS 北京)}。 mode:显式传入(admin 预览指定模式)则用它、**不改持久化配置**;不传(客户端 /savings-feed)读 持久化的 marquee_feed_mode;非法值一律回退到持久化模式。 - 真实条:success 且 0 < saved ≤ 上限,按 user 去重(同一用户只取最新一条,避免单人刷屏)。 + 真实条:success 且 0 < saved ≤ 上限,**不按 user 去重**(打乱 + 去连簇:相邻尽量不同用户、减少单人连刷)后取前 limit。 不足用启用的种子补齐——**公平随机抽取** need 个(而非固定取前 N),让所有种子都有机会露出; 种子用户名留空则随机合成(避开撞名),金额取**长尾随机**(小额居多、偶尔大额,更像真实分布)。 真实 + 种子仍不满 limit → 内置合成条**补满**,保证轮播既不空也不稀疏。 @@ -235,19 +251,13 @@ def get_feed(db: Session, limit: int = 8, mode: str | None = None) -> list[dict] items: list[dict] = [] used_names: set[str] = set() - # 真实条(mixed / real):取较多近期记录(带 ~30s 缓存)后按 user 去重;金额超上限的异常值已在查询剔除。 + # 真实条(mixed / real):**不按 user 去重**——打乱 + 去连簇(相邻尽量不同用户、减少单人连刷)后取前 + # limit;金额超上限的异常值已在查询剔除。同一用户可多条露出,但被打散、尽量不连续。 if mode != "seed": - rows = _recent_real_rows(db) - seen_users: set[int] = set() - for uid, sc, nick in rows: - if uid in seen_users: - continue - seen_users.add(uid) + for uid, sc, nick in _shuffle_declustered(_recent_real_rows(db))[:limit]: name = _mask_real(nick, uid) - used_names.add(name) # 真实名按昵称/id 稳定;偶发撞名可接受 + used_names.add(name) # 同一用户可多条,名字重复无害(used_names 仅供种子避重) items.append({"masked_user": name, "saved_amount_cents": int(sc)}) - if len(items) >= limit: - break # 种子补位 + 合成兜底(mixed / seed):mixed 下补真实不足的部分,seed 下全量用种子/合成。 # real 模式**跳过**——只出真实,不掺任何假数据(真实不足则少于 limit,为 0 时返回空)。 @@ -300,6 +310,78 @@ def get_feed(db: Session, limit: int = 8, mode: str | None = None) -> list[dict] return items +# ===== admin 侧:分页浏览「当前模式下可展示的记录」(审核用,不去重) ===== +_REAL_BROWSE_CAP = 1000 # 真实记录一次最多纳入这么多去洗牌+分页(足够审核;防超大库全量洗牌) +_BROWSE_SEED = 20260707 # 固定洗牌种子:同一批数据下排列恒定 → 翻页稳定、能翻遍全部 + + +def _seed_browse_row(seed: OpsMarqueeSeed) -> dict: + """把一条种子按其「生成逻辑」**确定性**生成一行浏览项(名字/金额按 seed.id 派生固定种子 → 翻页稳定)。 + 名字:运营手填的非模板名原样用,否则本地合成;金额:区间内确定性长尾取值。user_id=0(种子无真实用户)。""" + r = random.Random(_BROWSE_SEED * 1_000_003 + int(seed.id)) + fixed = (seed.masked_user or "").strip() + name = fixed if (fixed and not fixed.startswith("用户****")) else _synth_name(r) + lo = max(0, int(seed.min_cents)) + hi = max(lo, int(seed.max_cents)) + amt = lo if hi <= lo else lo + int(round((hi - lo) * (r.random() ** 2.2))) + return {"masked_user": name, "saved_amount_cents": amt, "created_at": "", "user_id": 0} + + +def list_real_records( + db: Session, mode: str | None = None, offset: int = 0, limit: int = 8 +) -> tuple[list[dict], int]: + """分页浏览「**当前模式**下可在 app 轮播展示的全部记录」,供 admin 逐页审核(**不去重**): + - 只真实:全部 success+省>0 的真实记录; + - 只种子:每条启用种子按生成逻辑各出一行; + - 混播:真实 + 种子 全部合在一起。 + 与 app 轮播同口径:先洗牌 + 去连簇(相邻尽量不同 user;种子各自独立、不算同 user);**固定种子** → + 同批数据下排列恒定,翻页不跳、能翻遍全部。返回 (items, total);item.user_id=0 表示种子。""" + mode = mode if mode in FEED_MODES else get_feed_mode(db) + # pool: [(cluster_key, item)];cluster_key 供去连簇——真实=user_id、种子=各自唯一负数(互不聚簇) + pool: list[tuple[int, dict]] = [] + if mode != "seed": + rows = db.execute( + select( + ComparisonRecord.user_id, + ComparisonRecord.saved_amount_cents, + User.nickname, + ComparisonRecord.created_at, + ) + .join(User, User.id == ComparisonRecord.user_id) + .where( + ComparisonRecord.status == "success", + ComparisonRecord.saved_amount_cents > 0, + ComparisonRecord.saved_amount_cents <= _REAL_MAX_CENTS, + ) + .order_by(ComparisonRecord.created_at.desc()) + .limit(_REAL_BROWSE_CAP) + ).all() + for uid, sc, nick, ca in rows: + pool.append(( + int(uid), + { + "masked_user": _mask_real(nick, int(uid)), + "saved_amount_cents": int(sc), + "created_at": str(ca)[:16] if ca is not None else "", + "user_id": int(uid), + }, + )) + if mode != "real": + seeds = ( + db.execute(select(OpsMarqueeSeed).where(OpsMarqueeSeed.enabled.is_(True))) + .scalars() + .all() + ) + for i, s in enumerate(seeds): + pool.append((-(i + 1), _seed_browse_row(s))) # 每个种子唯一 key → 互不聚簇 + total = len(pool) + # 每次用同一固定种子新建 Random → 同批数据排列恒定(翻页稳定);同时相邻尽量不同 user。 + ordered = _shuffle_declustered(pool, random.Random(_BROWSE_SEED)) + off = max(0, offset) + items = [item for _key, item in ordered[off : off + limit]] + return items, total + + # ===== 运营侧:种子 CRUD ===== def list_seeds(db: Session) -> list[OpsMarqueeSeed]: return list( From 9e082e6376b01fc55359191b231809668907a6b1 Mon Sep 17 00:00:00 2001 From: liujiahui Date: Thu, 9 Jul 2026 01:09:03 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=9D=83=E9=99=90?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=94=AF=E6=8C=81=E3=80=8C=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E3=80=8D=E8=A7=92=E8=89=B2=EF=BC=88=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=EF=BC=89=20(#126)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit admin_user 加 pages_override(可空 JSON)+ Alembic 迁移；role==custom 时可见页由逐页勾选决定，否则跟随角色。 create/update 收 pages_override(切回普通角色自动清空)，_validate_role 放行 custom 哨兵角色。 登录/me 下发有效页时优先用 override → 左侧导航按勾选即时生效。补 4 个用例，test_admin_roles 全绿。 配套前端 PR：shaguabijia-admin-web#admin-custom-perms。 --------- Co-authored-by: no_gen_mu Reviewed-on: https://gitea.shaguabijia.com/WonderableAI/shaguabijia-app-server/pulls/126 Co-authored-by: liujiahui Co-committed-by: liujiahui --- alembic/versions/admin_user_pages_override.py | 35 +++++++++ app/admin/permissions.py | 3 + app/admin/repositories/admin_user.py | 5 +- app/admin/routers/admins.py | 33 ++++++-- app/admin/routers/auth.py | 9 ++- app/admin/schemas/admin.py | 6 +- app/admin/schemas/auth.py | 5 +- app/models/admin.py | 5 +- tests/test_admin_roles.py | 77 +++++++++++++++++++ 9 files changed, 167 insertions(+), 11 deletions(-) create mode 100644 alembic/versions/admin_user_pages_override.py diff --git a/alembic/versions/admin_user_pages_override.py b/alembic/versions/admin_user_pages_override.py new file mode 100644 index 0000000..ca49110 --- /dev/null +++ b/alembic/versions/admin_user_pages_override.py @@ -0,0 +1,35 @@ +"""admin_user 加 pages_override 列(「自定义」权限:按人存专属可见页 key 列表) + +权限管理页新增「自定义」角色:选它时该成员的可见页不跟随任何共享角色,而由逐页勾选决定, +存这个人专属的一份页 key 列表。仅 role == "custom" 时有效;普通角色为 None(可见页跟随角色)。 +PG 用 JSONB,SQLite 退化为通用 JSON(同 admin_audit_log.detail / comparison_record.raw_payload)。 + +Revision ID: admin_user_pages_override +Revises: admin_user_plain_password +Create Date: 2026-07-08 00:00:00.000000 +""" + +from collections.abc import Sequence + +import sqlalchemy as sa +from sqlalchemy.dialects.postgresql import JSONB + +from alembic import op + +revision: str = "admin_user_pages_override" +down_revision: str | Sequence[str] | None = "admin_user_plain_password" +branch_labels: str | Sequence[str] | None = None +depends_on: str | Sequence[str] | None = None + +# 与 app/models/admin.py 的 _JSON 一致:PG JSONB / 其它 JSON +_JSON = sa.JSON().with_variant(JSONB(), "postgresql") + + +def upgrade() -> None: + with op.batch_alter_table("admin_user", schema=None) as batch_op: + batch_op.add_column(sa.Column("pages_override", _JSON, nullable=True)) + + +def downgrade() -> None: + with op.batch_alter_table("admin_user", schema=None) as batch_op: + batch_op.drop_column("pages_override") diff --git a/app/admin/permissions.py b/app/admin/permissions.py index e17f7db..ca0ee33 100644 --- a/app/admin/permissions.py +++ b/app/admin/permissions.py @@ -9,6 +9,9 @@ super_admin 为内建全权角色,恒可见全部页(effective_pages 特判)。 from __future__ import annotations SUPER_ADMIN_ROLE = "super_admin" +# 「自定义」哨兵角色:不是 admin_role 表里的行,而是标记「这个人的可见页由 pages_override 决定」。 +# admin_user.role == CUSTOM_ROLE 时,有效可见页取 admin_user.pages_override(见 auth._admin_out_with_pages)。 +CUSTOM_ROLE = "custom" # 分组镜像前端导航(app/(main)/layout.tsx 的 NAV_GROUPS);key = 路由一级 PERMISSION_CATALOG: list[dict] = [ diff --git a/app/admin/repositories/admin_user.py b/app/admin/repositories/admin_user.py index 828efe7..d9055df 100644 --- a/app/admin/repositories/admin_user.py +++ b/app/admin/repositories/admin_user.py @@ -26,14 +26,17 @@ def create_admin( password: str, role: str = "operator", plain_password: str | None = None, + pages_override: list[str] | None = None, ) -> AdminUser: """建管理员。plain_password 非空则额外留存明文(后台 UI 建的账号传,供权限管理页复看); - 脚本/起后台建账号不传(留 None → 前端不显示密码)。""" + 脚本/起后台建账号不传(留 None → 前端不显示密码)。 + pages_override:role=="custom" 时传专属可见页 key 列表;普通角色为 None。""" admin = AdminUser( username=username, password_hash=hash_password(password), role=role, plain_password=plain_password, + pages_override=pages_override, ) db.add(admin) db.commit() diff --git a/app/admin/routers/admins.py b/app/admin/routers/admins.py index 5273a45..60d9511 100644 --- a/app/admin/routers/admins.py +++ b/app/admin/routers/admins.py @@ -5,7 +5,7 @@ from fastapi import APIRouter, Depends, HTTPException, Request from app.admin.audit import write_audit from app.admin.deps import AdminDb, CurrentAdmin, get_client_ip, require_role -from app.admin.permissions import SUPER_ADMIN_ROLE +from app.admin.permissions import CUSTOM_ROLE, SUPER_ADMIN_ROLE, sanitize_pages from app.admin.repositories import admin_role as role_repo from app.admin.repositories import admin_user as admin_repo from app.admin.schemas.admin import AdminCreateRequest, AdminUpdateRequest @@ -26,14 +26,22 @@ def _active_super_count(db: AdminDb) -> int: def _validate_role(db: AdminDb, role: str) -> None: - """角色必须是 super_admin 或 admin_role 表里已存在的角色,否则 400。""" - if role == SUPER_ADMIN_ROLE: + """角色必须是 super_admin / custom(自定义) / admin_role 表里已存在的角色,否则 400。""" + if role in (SUPER_ADMIN_ROLE, CUSTOM_ROLE): return role_repo.ensure_builtin_roles(db) # 空表(测试/全新库)兜底播种,再校验 if role_repo.get_role(db, role) is None: raise HTTPException(status_code=400, detail=f"角色不存在: {role}") +def _clean_override(role: str, pages_override: list[str] | None) -> list[str] | None: + """按最终角色算出该存的 pages_override:custom → 勾选集(过滤非法 key,可空列表); + 非 custom → None(切回普通角色即清空自定义页)。""" + if role == CUSTOM_ROLE: + return sanitize_pages(pages_override) + return None + + @router.get("", response_model=list[AdminOut], summary="管理员列表(含明文密码,super_admin 专属)") def list_admins(db: AdminDb) -> list[AdminOut]: out: list[AdminOut] = [] @@ -51,13 +59,16 @@ def create_admin( if admin_repo.get_by_username(db, body.username) is not None: raise HTTPException(status_code=409, detail="用户名已存在") _validate_role(db, body.role) + override = _clean_override(body.role, body.pages_override) new = admin_repo.create_admin( db, username=body.username, password=body.password, role=body.role, plain_password=body.password, # UI 建的账号留存明文,供权限管理页复看 + pages_override=override, ) write_audit( db, admin, action="admin.create", target_type="admin", target_id=new.id, - detail={"username": new.username, "role": new.role}, ip=get_client_ip(request), commit=True, + detail={"username": new.username, "role": new.role, "pages_override": override}, + ip=get_client_ip(request), commit=True, ) return AdminOut.model_validate(new) @@ -89,7 +100,8 @@ def update_admin( _validate_role(db, body.role) changes: dict = {} - if body.role is not None and body.role != target.role: + role_changed = body.role is not None and body.role != target.role + if role_changed: changes["role"] = {"before": target.role, "after": body.role} target.role = body.role if body.status is not None and body.status != target.status: @@ -99,6 +111,17 @@ def update_admin( changes["password"] = "reset" target.password_hash = hash_password(body.password) target.plain_password = body.password # 同步留存明文,权限管理页复看保持一致 + + # 自定义可见页:按「最终角色」(target.role,已应用完角色变更)决定该存什么。 + # - 切到/维持 custom 且传了 pages_override → 用勾选集;切到 custom 没传 → 清成空列表。 + # - 切回普通角色 → 清空 override(_clean_override 返回 None)。 + # - 角色没变、只传 pages_override(编辑现有 custom 用户的勾选)→ 也更新。 + if role_changed or body.pages_override is not None: + new_override = _clean_override(target.role, body.pages_override) + if new_override != target.pages_override: + changes["pages_override"] = {"before": target.pages_override, "after": new_override} + target.pages_override = new_override + if not changes: raise HTTPException(status_code=400, detail="无任何变更字段") db.commit() diff --git a/app/admin/routers/auth.py b/app/admin/routers/auth.py index 6aa8e35..27b5bb3 100644 --- a/app/admin/routers/auth.py +++ b/app/admin/routers/auth.py @@ -6,6 +6,7 @@ import logging from fastapi import APIRouter, Depends, HTTPException from app.admin.deps import AdminDb, CurrentAdmin +from app.admin.permissions import CUSTOM_ROLE, sanitize_pages from app.admin.repositories import admin_role as role_repo from app.admin.repositories import admin_user as admin_repo from app.admin.schemas.auth import AdminLoginRequest, AdminLoginResponse, AdminOut @@ -19,9 +20,13 @@ router = APIRouter(prefix="/admin/api/auth", tags=["admin-auth"]) def _admin_out_with_pages(admin, db: AdminDb) -> AdminOut: # noqa: ANN001 - """AdminOut + 当前角色有效可见页(前端左侧导航按此过滤)。""" + """AdminOut + 有效可见页(前端左侧导航按此过滤)。 + role=="custom" → 用这个人的 pages_override(按人自定义,过滤悬空 key);其余走角色解析。""" out = AdminOut.model_validate(admin) - out.pages = role_repo.effective_pages_of(db, admin.role) + if admin.role == CUSTOM_ROLE: + out.pages = sanitize_pages(admin.pages_override) + else: + out.pages = role_repo.effective_pages_of(db, admin.role) return out diff --git a/app/admin/schemas/admin.py b/app/admin/schemas/admin.py index fcde8bf..ae12752 100644 --- a/app/admin/schemas/admin.py +++ b/app/admin/schemas/admin.py @@ -13,14 +13,18 @@ class AdminCreateRequest(BaseModel): username: str = Field(..., min_length=3, max_length=64) password: str = Field(..., min_length=8, max_length=72) # bcrypt ≤72 字节 role: str = Field("operator", min_length=1, max_length=32) + # 仅当 role == "custom":这个人专属可见页 key 列表(逐页勾选结果)。其余角色不传/忽略。 + pages_override: list[str] | None = None class AdminUpdateRequest(BaseModel): - """改角色 / 启用禁用 / 重置密码,字段都可选(只改传了的)。""" + """改角色 / 启用禁用 / 重置密码 / 自定义可见页,字段都可选(只改传了的)。""" role: str | None = Field(None, min_length=1, max_length=32) status: Literal["active", "disabled"] | None = None password: str | None = Field(None, min_length=8, max_length=72) + # 改成/更新「自定义」可见页;role 切回普通角色时后端会清空 override(见路由)。 + pages_override: list[str] | None = None class AdminAuditLogOut(BaseModel): diff --git a/app/admin/schemas/auth.py b/app/admin/schemas/auth.py index 3972fed..ef64114 100644 --- a/app/admin/schemas/auth.py +++ b/app/admin/schemas/auth.py @@ -21,8 +21,11 @@ class AdminOut(BaseModel): created_at: datetime last_login_at: datetime | None = None # 该管理员当前角色的有效可见页(= 左侧导航项 key);仅登录 / /me 填充,列表接口默认空。 - # 前端据此过滤左侧导航(super_admin = 全部页)。见 app/admin/permissions.py。 + # 前端据此过滤左侧导航(super_admin = 全部页;role=="custom" = pages_override)。见 permissions.py。 pages: list[str] = [] + # 「自定义」可见页原始勾选集(role=="custom" 时非空);列表接口下发,供权限管理页编辑回填勾选。 + # 普通角色为 None。from_attributes 自动从 ORM 列取。 + pages_override: list[str] | None = None # 明文登录密码:仅「管理员账号列表」(super_admin 专属路由)填充,供权限管理页编辑时复看; # 无留存(脚本建的超管 / 旧账号)为 None → 前端不显示。登录 / /me 不下发(保持 None)。 password: str | None = None diff --git a/app/models/admin.py b/app/models/admin.py index 0c56963..8bb72b4 100644 --- a/app/models/admin.py +++ b/app/models/admin.py @@ -28,8 +28,11 @@ class AdminUser(Base): # 明文登录密码:仅「后台 UI 创建/重置」的管理员留存,供超管在权限管理页复看转交。 # 脚本/起后台时建的超管账号不写(为 None → 前端「不显示密码」)。⚠️ 内部工具便利取舍,见 create/list。 plain_password: Mapped[str | None] = mapped_column(String(128), nullable=True) - # super_admin(全权+管账号)/ finance(钱:提现+金币)/ operator(用户+反馈+大盘) + # super_admin(全权+管账号)/ finance(钱:提现+金币)/ operator(用户+反馈+大盘)/ custom(按人自定义) role: Mapped[str] = mapped_column(String(20), nullable=False, default="operator") + # 「自定义」权限:仅当 role == "custom" 时有效,存这个人专属的可见页 key 列表(不共享给他人)。 + # 非 custom 用户为 None → 可见页跟随角色。登录/`/me` 下发有效页时,非空即优先用它(见 auth._admin_out_with_pages)。 + pages_override: Mapped[list | None] = mapped_column(_JSON, nullable=True) # active / disabled status: Mapped[str] = mapped_column(String(20), nullable=False, default="active") diff --git a/tests/test_admin_roles.py b/tests/test_admin_roles.py index ce3f4ca..85ab010 100644 --- a/tests/test_admin_roles.py +++ b/tests/test_admin_roles.py @@ -150,3 +150,80 @@ def test_create_admin_rejects_unknown_role(admin_client, super_token) -> None: headers=_auth(super_token), ) assert r.status_code == 400 + + +def _login_pages(username: str, password: str = "pass1234") -> list[str]: + """以某账号登录,取下发的有效可见页(左侧导航过滤依据)。""" + c = TestClient(admin_app) + return c.post( + "/admin/api/auth/login", json={"username": username, "password": password} + ).json()["admin"]["pages"] + + +def test_custom_role_create_pages_take_effect(admin_client, super_token) -> None: + # 建「自定义」账号:role=custom + 勾选页(含一个非法 key,应被过滤) + r = admin_client.post( + "/admin/api/admins", + json={ + "username": "cust_user", "password": "pass1234", "role": "custom", + "pages_override": ["dashboard", "withdraws", "xx-bad"], + }, + headers=_auth(super_token), + ) + assert r.status_code == 200, r.text + # 登录下发的 pages == 勾选集(非法 key 过滤),真正驱动左侧导航 + assert set(_login_pages("cust_user")) == {"dashboard", "withdraws"} + # 账号列表回显原始勾选集(供编辑回填),同样已过滤 + admins = {a["username"]: a for a in admin_client.get("/admin/api/admins", headers=_auth(super_token)).json()} + assert set(admins["cust_user"]["pages_override"]) == {"dashboard", "withdraws"} + assert admins["cust_user"]["role"] == "custom" + + +def test_custom_role_update_and_switch_back_clears_override(admin_client, super_token) -> None: + admin_client.post( + "/admin/api/admins", + json={ + "username": "cust_sw", "password": "pass1234", "role": "custom", + "pages_override": ["dashboard"], + }, + headers=_auth(super_token), + ) + aid = next( + a["id"] for a in admin_client.get("/admin/api/admins", headers=_auth(super_token)).json() + if a["username"] == "cust_sw" + ) + # 只改勾选集(角色不变)→ 生效 + u = admin_client.patch( + f"/admin/api/admins/{aid}", json={"pages_override": ["dashboard", "feedbacks"]}, + headers=_auth(super_token), + ) + assert u.status_code == 200, u.text + assert set(_login_pages("cust_sw")) == {"dashboard", "feedbacks"} + # 切回普通角色 operator → override 清空,pages 跟随角色(运营页集,且不含 admins) + u2 = admin_client.patch( + f"/admin/api/admins/{aid}", json={"role": "operator"}, headers=_auth(super_token) + ) + assert u2.status_code == 200, u2.text + admins = {a["username"]: a for a in admin_client.get("/admin/api/admins", headers=_auth(super_token)).json()} + assert admins["cust_sw"]["pages_override"] is None + pages = set(_login_pages("cust_sw")) + assert "feedbacks" in pages and "admins" not in pages # 运营口径,自定义页已不生效 + + +def test_switch_operator_to_custom_sets_override(admin_client, super_token) -> None: + admin_client.post( + "/admin/api/admins", + json={"username": "op2cust", "password": "pass1234", "role": "operator"}, + headers=_auth(super_token), + ) + aid = next( + a["id"] for a in admin_client.get("/admin/api/admins", headers=_auth(super_token)).json() + if a["username"] == "op2cust" + ) + u = admin_client.patch( + f"/admin/api/admins/{aid}", + json={"role": "custom", "pages_override": ["config"]}, + headers=_auth(super_token), + ) + assert u.status_code == 200, u.text + assert set(_login_pages("op2cust")) == {"config"} From 0cf5b3816ff93fc8010d7d5d987f2e4c4a3d36b2 Mon Sep 17 00:00:00 2001 From: liujiahui Date: Thu, 9 Jul 2026 10:03:09 +0800 Subject: [PATCH 6/6] =?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()