WonderableAI/shaguabijia-app-server
10
0
Fork 0
Code Issues Pull Requests 8 Actions Packages Projects Releases Wiki Activity

feat: 接入京东联盟订单到数据大盘 #101

Open
Ghost wants to merge 5 commits from intern/chenshuobo/dashboard-jd-cps-20260628 into main
pull from: intern/chenshuobo/dashboard-jd-cps-20260628
merge into: WonderableAI:main
Conversation 0 Commits 5 Files Changed 2
+91 -13
Ghost commented 2026-07-01 14:58:41 +08:00
Copy Link
Copy Source
No description provided.
Ghost added 4 commits 2026-07-01 14:58:41 +08:00
feat: 接入京东联盟订单到数据大盘 08a16c7632 
改了什么：新增京东联盟订单查询客户端、cps_order 京东字段迁移、CPS 对账接口 platform=all/jd、数据大盘京东订单与佣金聚合。
为什么改：数据大盘需要展示京东 CPS 真实订单佣金，不再保持占位。
验证方式：python -m pytest tests\\test_admin_read.py::test_dashboard_overview tests\\test_cps_admin.py::test_jd_reconcile_updates_dashboard -q；本地真实拉取 2026-06-27 京东订单 3 行，页面显示京东有效 1 单/佣金 ¥0.13。
fix: 数据大盘京东 CPS 仅统计实际佣金 ad6a579ff8
fix: 调整数据大盘 DAU 为开始比价和开始领券口径 a7d8562ddd
fix: 修复美团订单时间入库并校准金币大盘口径 21fc930c0a 
改了什么：补全美团订单时间戳转换，避免 pay_time 为空导致昨日 CPS 收益漏算；同时让金币经济的本期/累计发放总数按领券、比价、激励视频、常规任务四项加总。
为什么改：产品核对发现昨日美团有收益但大盘未显示，且发放金币总数与分类卡片不一致。
验证方式：后端聚合自检确认 2026-06-30 美团佣金 86 分、有效订单 2 单，金币总数等于四项分类之和；py_compile 通过。
Ghost added 1 commit 2026-07-01 15:02:28 +08:00
merge: 合并 main 并解决数据大盘冲突 70c238297a 
改了什么：合并最新 main，解决 app/admin/repositories/cps.py 和 app/admin/repositories/stats.py 的冲突。
保留内容：京东 CPS 接入、美团订单 payTime 转换修复、金币经济四项加总口径。
验证方式：py_compile 通过，_ts_to_dt 时间戳转换检查通过，git diff --check 通过。
Checking for merge conflicts…
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin intern/chenshuobo/dashboard-jd-cps-20260628:intern/chenshuobo/dashboard-jd-cps-20260628
git checkout intern/chenshuobo/dashboard-jd-cps-20260628
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
gaomengzhuo guke kongderong liujiahui marco wangyaoguang wanlangjie wusiyi zhuzihao zuochenyong
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: WonderableAI/shaguabijia-app-server#101
Delete Branch "intern/chenshuobo/dashboard-jd-cps-20260628"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?