diff --git a/CHANGELOG.md b/CHANGELOG.md index a2eedcc0..a2f452ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ > 本仓 CHANGELOG 自重建起记(POC 明细见归档仓 /data/poc-archive/repos/go-sms.git 的 CHANGELOG.md,已冻结)。 +## 2026-11-14(深夜③)· S2-D5 利润/返点/三方对账 —— **S2 泳道收官** + +- **settle/profit.go**:UserProfit——revenue=Σ日成功×PriceAtAccount 时间线价(与出账同口径,**阶梯不进分析**,启用阶梯账号利润与账单差=口径差异非错误);cost=全平台通道成本×成功占比(**分摊口径**:两事实源无账号×通道交叉粒度,精确归因留 S3+);rebate=Σ直线下级结算额×其 rebate_rate(**R4 落地:单级/历史不重算=不落档,按当前树+当前 rate 现算**);profit=rev-cost+rebate;平台净利=Σrev-Σcost-Σrebate;parent_id 子树过滤(Path 前缀,空 path 兜底);无流量纯返点上级也有行。ChannelProfit——cost=Σ日成功×通道价;revenue=用户收入×通道成功占比(同分母,Σ守恒)。 +- **settle/reconcile.go**:三方对账——账号=明细直查↔billing_consume_log↔settle_customer(条数);通道=明细↔stats_channel_daily;上家=日汇总×当前归并/billing_mode 重推↔账单快照(生成后换绑/改模式/重刷如实暴露);**金额不比**(快照语义,事后调价必生噪音,金额核对走 XLSX);bill_missing 单列不判失败;AllZero=S2 出口判据。 +- **cmd/reconcile/settle-check**:`-period [-json]`,退出码 0=all_zero/1=有差异/2=错误;**handler +2 端点** /stats/profit/users·channels(平台角色门,缺省窗=本月至今);openapi v1.3.0 双端点描述对齐。 +- **测试 5 件**:利润(树/返点/分摊/子树/纯返点上级/守恒)+通道(直算/分摊/过滤)+对账(全链 AllZero+篡改 consume/stats/删账单逐项暴露+missing 不判失败)+handler(数值/403/坏日期)。门禁 vet/**-race 39 包**/lint 0。 +- **真机全链**:种 2026-10 空月(通道/上家 9101)→汇总 1/1→下家 0.2→阶梯覆写 0.1→结账 SettleRecord→上家 2/0.1→利润双端点(rev0.2 时间线 vs 账单 0.1=口径差异实证)→**settle-check all_zero=true EXIT=0(S2 出口判据达成)**→清理 11 项零残留。 +- **走查脚本扩 D4/D5**(s2-walkthrough.sh D2~D5 全域+自动清理):AI 预走查 **27 PASS/0 FAIL**;**修复两处存量 bug**——D2 段明细 ID 9302… 超 int64 上限 MySQL 拒收(改 7302… 段)、D2/D3 清理段 $ON/$B0 单引号内不展开致 SQL 语法错(改 printf|mysql_pipe 外层展开)。 +- **收官判定**:s2-closeout.md——出口两项(结算单测+对账差异 0)全 ✅,六项裁决 R1~R6 全闭环,**S2 泳道收官**(附在途补正:用户本人走查)。验收单 `docs/acceptance/s2-d5.md`。 + ## 2026-11-14(深夜②)· S2 结算验收页(用户感知断层补正:前端人工验收面) - **动因**:用户裁决「需要人工前端页面验收」——S2 后端 D1~D4 不可见,评审者零感知;以最小可视化验收面补正(S3 结算页面族在此精修)。 diff --git a/api/openapi.yaml b/api/openapi.yaml index 3a75ddd6..15a2229d 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -958,25 +958,25 @@ paths: /stats/profit/users: get: tags: [settle] - summary: 用户利润分析(含下级树聚合:revenue=Σ结算额,cost=其流量通道成本分摊,rebate=返点支出;历史归属不随换上级重算) + summary: 用户利润分析(平台角色)——revenue=Σ日成功×用户时间线价(阶梯不进分析);cost=通道成本按成功条数占比分摊;rebate=直线下级结算额×其 rebate_rate(R4 单级,历史不重算);profit=revenue-cost+rebate;parent_id=子树过滤(Path) parameters: - {name: date_from, in: query, schema: {type: string, format: date}} - {name: date_to, in: query, schema: {type: string, format: date}} - {name: parent_id, in: query, schema: {type: integer, format: int64, description: 以该账号为根的子树(缺省=全平台)}} - {name: page, in: query, schema: {type: integer, default: 1}} - {name: page_size, in: query, schema: {type: integer, default: 20, maximum: 100}} - responses: {"200": {description: "list{account_id,revenue,cost,rebate,profit}(元)"}} + responses: {"200": {description: "{list[...],total,summary{total_revenue,total_cost,total_rebate,platform_profit}}(元)"}} /stats/profit/channels: get: tags: [settle] - summary: 通道利润分析(收入=Σ日成功条数×用户价,成本=Σ×通道价;date_from/date_to/channel_id) + summary: 通道利润分析(平台角色)——cost=Σ日成功×通道时间线价;revenue=全平台用户收入×通道成功占比分摊(无账号×通道交叉粒度事实源);profit=revenue-cost;date_from/date_to/channel_id parameters: - {name: date_from, in: query, schema: {type: string, format: date}} - {name: date_to, in: query, schema: {type: string, format: date}} - {name: channel_id, in: query, schema: {type: integer, format: int64}} - {name: page, in: query, schema: {type: integer, default: 1}} - {name: page_size, in: query, schema: {type: integer, default: 20, maximum: 100}} - responses: {"200": {description: "list{channel_id,upstream_id,success_count,revenue,cost,profit}(元)"}} + responses: {"200": {description: "list{channel_id,name,upstream_id,success_count,revenue,cost,profit}(元)"}} /ops/settle/aggregate: post: tags: [settle] diff --git a/cmd/reconcile/settle-check/main.go b/cmd/reconcile/settle-check/main.go new file mode 100644 index 00000000..6d7e2427 --- /dev/null +++ b/cmd/reconcile/settle-check/main.go @@ -0,0 +1,68 @@ +// reconcile/settle-check S2-D5:三方对账子命令——明细直查 vs 日汇总 vs +// 结算单(diff=0 为 S2 泳道出口判据)。 +// +// 用法(仓库根目录):go run ./cmd/reconcile/settle-check -period 2026-11 [-json] +// 退出码:0=三方差异全零;1=存在差异(明细见输出);2=运行错误。 +// 注意:金额不在比对范围(结算单金额=出账时点价/阶梯快照,事后调价重算必生 +// 噪音,口径见 settle/reconcile.go 头注);账单未生成=流程状态,计入 +// bill_missing 但不影响 AllZero 判定。 +package main + +import ( + "context" + "encoding/json" + "flag" + "fmt" + "os" + "time" + + "go.uber.org/zap" + + "go-sms/internal/app" + "go-sms/internal/service/settle" +) + +func main() { + period := flag.String("period", time.Now().Format("2006-01"), "对账账期 YYYY-MM(缺省=当前月)") + asJSON := flag.Bool("json", false, "输出完整 JSON 报告(缺省=人类可读摘要+异常行)") + flag.Parse() + + a, err := app.New(app.Options{ServiceName: "reconcile-settle-check"}) + if err != nil { + fmt.Fprintln(os.Stderr, "app init:", err) + os.Exit(2) + } + rep, err := settle.NewService(a.DB()).ReconcilePeriod(context.Background(), *period) + if err != nil { + a.Lg().Error("settle_check_failed", zap.String("period", *period), zap.Error(err)) + fmt.Fprintln(os.Stderr, "reconcile:", err) + os.Exit(2) + } + + if *asJSON { + out, _ := json.MarshalIndent(rep, "", " ") + fmt.Println(string(out)) + } else { + s := rep.Summary + fmt.Printf("settle-check period=%s as_of=%s\n", rep.Period, rep.AsOf.Format(time.RFC3339)) + fmt.Printf("accounts: checked=%d diffs=%d bill_missing=%d\n", s.AccountsChecked, s.AccountDiffs, s.BillMissing) + fmt.Printf("channels: checked=%d diffs=%d\n", s.ChannelsChecked, s.ChannelDiffs) + fmt.Printf("upstreams: checked=%d diffs=%d\n", s.UpstreamsChecked, s.UpstreamDiffs) + for _, r := range rep.Accounts { + fmt.Printf(" [DIFF] account=%d detail=%d consume=%d bill=%v\n", + r.AccountID, r.DetailSuccess, r.ConsumeSuccess, r.BillSuccess) + } + for _, r := range rep.Channels { + fmt.Printf(" [DIFF] channel=%d detail=%d daily=%d\n", + r.ChannelID, r.DetailSuccess, r.DailySuccess) + } + for _, r := range rep.Upstreams { + fmt.Printf(" [DIFF] upstream=%d daily=%d bill=%v\n", + r.UpstreamID, r.DailyCount, r.BillSuccess) + } + fmt.Printf("all_zero=%v\n", s.AllZero) + } + if !rep.Summary.AllZero { + os.Exit(1) + } +} diff --git a/docs/acceptance/s2-closeout.md b/docs/acceptance/s2-closeout.md new file mode 100644 index 00000000..94b5daa3 --- /dev/null +++ b/docs/acceptance/s2-closeout.md @@ -0,0 +1,51 @@ +# S2 结算域泳道收官 人工验收单(2026-11-14 深夜②) + +> 前置:s2-d1~d5.md(D1 表设计/D2 消耗日汇总/D3 充值审核/D4 出账+阶梯/D5 利润+对账)。 +> 本单=《Go-sms-重建计划.md》S2 行出口判定:**结算域后端全量(D 层),出口=结算单测+对账差异 0**。 + +## 一、S2 五日交付总览 + +| 日 | 主题 | 核心交付 | 状态 | +|---|---|---|---| +| D1(11-14 上午) | 表设计+v20+契约 | 六项裁决 R1~R6(docs/review/s2-settle-table-review.md)/迁移 v20_settle_domain/实体同步/openapi v1.3.0 +20 端点草案 | ✅ | +| D2(11-14 傍晚) | 消耗日汇总引擎 | consume.go+job.go(滚动重刷:1h×近 4 天,72h 回执窗 UNKNOWN 迁移靠重刷收敛)+/billing/consume+/ops/settle/aggregate+config/metrics/装配;sqlite 6 测试+真 MySQL 端到端 | ✅ | +| D3(11-14 夜) | 充值审核流 | recharge.go(R3 双通道:confirm 单事务 CAS+余额自增+流水 ref_id=order_no)+订单族四端点(二级权限+平台角色门)+ISC:039 三处;7 测试含并发 confirm | ✅ | +| D4(11-14 深夜) | 出账引擎+阶梯 | price.go(R1/R6 唯一换算:业务线×时间线回溯+阶梯月量落档;D4-0 六口径 Q1~Q6 经批准生效)+bill.go(下家/上家生成-确认-结账+SettleRecord+ladder CRUD)+export.go XLSX+15 端点;**阶梯结算单测(S2 显式验收项)**+真机出账全链+真 XLSX 5637B | ✅(用户走查在途) | +| 前端验收面(11-14 深夜②) | 结算管理页 | 四 Tab(账单/消耗/订单/阶梯)+api 12 端点+seed 演示(s2demo)+Playwright 预走查真库闭环(余额+1000/账单 1955.00);前端四件全绿 | ✅(用户页面走查在途) | +| D5(11-14 深夜③) | 利润/返点/对账 | profit.go(用户利润含下级树 Path/返点 R4+通道利润分摊口径)+reconcile.go(三方对账)+settle-check 子命令+双端点;5 测试+真机全链 **all_zero=true EXIT=0**;走查脚本扩 D4/D5 全域 27 PASS | ✅(用户走查在途) | + +## 二、S2 出口判定(对齐《重建计划》S2 行) + +| 出口项 | 判定 | 证据 | +|---|---|---| +| **结算单测** | ✅ | 阶梯结算单测(s2-d4 §一#6:首档覆写/恰好落档/删档回退/月中调价分档)+出账状态机+充值 CAS 并发+汇总幂等重刷;settle 包 18 测试件全绿(-race) | +| **对账差异 0** | ✅ | settle-check 三方对账(明细直查↔日汇总↔结算单)真机 **all_zero=true 退出码 0**(s2-d5 §三);单测覆盖全零+篡改逐项暴露 | +| D 层后端全量 | ✅ | 消耗汇总/充值审核/出账/阶梯/结账/导出/利润/返点/对账 9 域 22 端点(v1.3.0 契约 20 端点全部落地+导出 2) | +| 门禁 | ✅ | vet 0 / **-race 全量 39 包 ok** / lint 0 / 前端四件全绿 | +| 真机验证 | ✅ | D2 端到端收敛实证/D3 冒烟+审计留痕/D4 出账全链+5637B XLSX/D5 利润+对账全链;数据全部还原零残留 | +| 前端验收面 | ✅ | 结算管理页四 Tab+真库闭环 Playwright 预走查(s2demo) | + +**S2 泳道状态:✅ 收官(附一项在途补正:S2 全域用户本人走查,D2~D5 脚本已备 27 PASS 预走查,待用户执行回填)。** + +## 三、六项裁决落点核对(D1 → 实现闭环) + +| 裁决 | 落点 | 状态 | +|---|---|---| +| R1 出账时刻计价 | price.go 唯一换算;明细 Fee 保持片数,send 域零改动 | ✅ | +| R2 事实源统一 | billing_consume_log+stats_channel_daily;stats_user_daily v20 DROP | ✅ | +| R3 充值双通道 | 即时到账保留+BillingOrder 审核流(ref_id=order_no 区分,D5 对账口径现成) | ✅ | +| R4 单级返点 | rebate_rate 消费于 profit.go(直线下级×rate,历史不重算=不落档现算) | ✅ | +| R5 阶梯表 | settle_ladder+落档覆写+独立单测 | ✅ | +| R6 条/元口径 | 条→元只在 price.go;余额/Count=条,账单/利润=元 | ✅ | + +## 四、遗留移交(不阻塞 S3) + +1. **用户本人走查在途**:D4 出账链+D5 利润/对账随本单脚本补正(s2-walkthrough.sh D2~D5); +2. **账号×通道交叉粒度事实源缺失**:利润 cost 分摊为占比口径(总量守恒、个体近似),精确归因需新增事实粒度(S3+ 择机); +3. 层级返点(多级分成)/月结自动生成调度(手动 generate 先行)/est_balance 校正余额录入——D1 评审已列显式不承诺; +4. 明细热窗(S4 分区)落地后,历史月对账基线=日汇总↔结算单两方(明细直查侧退场,reconcile.go 头注已声明); +5. 利润分析前端页(views/settle/profit,FE D34)= S3 前端泳道;mock handlers 未含 /stats/profit(前端未消费,零影响)。 + +## 五、下一步 + +S3 前端泳道(views 31 页搬运+FE-6 权限矩阵走查+Mock 下线;见《重建计划》)——开工前置:用户走查回填不阻塞 S3 开工判定(在途补正机制)。 diff --git a/docs/acceptance/s2-d5.md b/docs/acceptance/s2-d5.md new file mode 100644 index 00000000..67a0c94f --- /dev/null +++ b/docs/acceptance/s2-d5.md @@ -0,0 +1,49 @@ +# S2-D5 利润/返点/三方对账 人工验收单(2026-11-14 深夜②) + +> 前置:s2-d4.md(出账+阶梯)。本单覆盖 D5:profit.go(用户利润含下级树/返点 R4+通道利润)+ +> reconcile.go(三方对账)+cmd/reconcile/settle-check+双端点;并作为 **S2 泳道收官日** +> (收官判定见 s2-closeout.md)。 + +## 一、交付物 + +| # | 任务 | 结果 | 证据 | +|---|---|---|---| +| 1 | **settle/profit.go** | ✅ | UserProfit:revenue=Σ日成功×PriceAtAccount 时间线价(与出账同口径,**阶梯不进分析**——启用阶梯账号利润行与账单金额差=口径差异非错误);cost=全平台通道成本×成功占比(**分摊口径**:两事实源无账号×通道交叉粒度,精确归因留 S3+);rebate=Σ直线下级窗口结算额×下级 rebate_rate(R4 单级,**历史不重算**=返点不落档、按当前树+当前 rate 现算);profit=revenue-cost+rebate;parent_id 子树过滤(Path 物化路径前缀,空 path 兜底 "/id>/");平台净利=Σrev-Σcost-Σrebate(返点平台流出/上级流入两口径并存);无流量纯返点上级也有行。ChannelProfit:cost=Σ日成功×PriceAtChannel;revenue=全平台用户收入×通道成功占比(与用户侧同分母,Σ通道rev=Σ用户rev 守恒) | +| 2 | **settle/reconcile.go** | ✅ | ReconcilePeriod(period):账号三方=明细直查↔billing_consume_log↔settle_customer(条数);通道两方=明细↔stats_channel_daily;上家=日汇总×**当前**归并/billing_mode 重推↔账单快照(生成后换绑/改模式/重刷如实暴露=Q4/Q6 快照语义的对账价值);**金额不比**(结算单金额=出账时点价/阶梯快照,事后调价重算必生噪音,金额核对走 XLSX 导出人工比对);bill_missing 单列不判失败(流程状态≠数据不一致);AllZero=三方 diff 全零 | +| 3 | **cmd/reconcile/settle-check** | ✅ | 子命令 `-period YYYY-MM [-json]`;人类可读摘要+异常行;退出码 0=all_zero/1=有差异/2=运行错误 | +| 4 | **handler +2 端点** | ✅ | GET /stats/profit/users(date_from/date_to/parent_id/分页)、GET /stats/profit/channels(…/channel_id/分页);平台角色门(admin/ops/service,group/customer 403,与充值订单列表同口径);缺省窗口=本月 1 号~今天 | +| 5 | **openapi v1.3.0 描述对齐** | ✅ | 双端点 summary 补分摊/阶梯不进分析/R4 语义与响应结构 | +| 6 | **测试 5 件**(settle 4+handler 1) | ✅ | TestProfit_Users(时间线价/分摊/单级返点/子树/汇总守恒/纯返点上级)、TestProfit_Channels(成本直算/收入分摊/过滤)、TestReconcile_AllZero(全链 diff=0)、TestReconcile_ExposesDiffs(篡改 consume/stats/删账单逐项暴露+missing 不判失败+非法 period)、TestSettleProfit_Endpoints(数值/403/坏日期) | +| 7 | **走查脚本扩 D4/D5** | ✅ | s2-walkthrough.sh 增 D4-1~D4-7(出账/阶梯/结账/XLSX)+D5-1~D5-4(利润/403/settle-check)+专用清理;**修复两处存量 bug**(见 §四) | + +## 二、门禁(七件套后端件) + +| 项 | 结果 | +|---|---| +| go vet ./... | ✅ RC=0 | +| go test -race ./...(全量) | ✅ **39 包 ok 零 FAIL**(settle 包 18 件) | +| golangci-lint v2.1.6 | ✅ 0 issues | + +## 三、真机验证(dev,2026-11-14 23:00,HS256 临时 token;网关串行重启 md5 一致) + +- **种子**(2026-10 空月):通道/上家 9101(success 口径)+账号1 价 0.10+通道价 0.05+明细 2 条(10-15,ID 7302 段); +- **出账链**:汇总 1/1 → 下家生成 amount=0.2(2×0.10)→ 阶梯 0 档 0.05 重算覆写 0.1 → 确认→结账(**SettleRecord direction=1/amount=0.1/operator=admin**)→ 已结 skipped=1 → 上家生成 **US202610-9101 count=2/amount=0.1**; +- **利润双端点**:users→acc1 succ2/**rev0.2(时间线价,与阶梯账单 0.1 的差=口径差异实证)**/cost0.1/profit0.1;channels→ch9101 succ2/cost0.1/rev0.2(分摊 2/2)/profit0.1; +- **settle-check -period 2026-10**:`accounts checked=1 diffs=0 bill_missing=0; channels 1/0; upstreams 1/0; all_zero=true` **退出码 0 —— S2 出口判据达成**; +- **清理**:11 项计数全 0 零残留(仅 demo seed 合法数据留库); +- **全脚本 AI 预走查**:s2-walkthrough.sh 三轮实跑 **27 PASS / 0 FAIL**(D2~D5 全域)。 + +## 四、口径与修复留痕 + +- 明细雪花 ID 直插 9302… 段超 int64 上限(9.22e18)MySQL 拒收——走查脚本 D2 段存量 bug(11-14 写后未实跑),D5 收官全脚本实跑暴露,统一改 7302… 段; +- 走查脚本 D2/D3 清理段 `$ON/$B0` 在 `sg docker -c '...'` 单引号内不展开(内层空展开致 `SET balance=` SQL 语法错)——改 printf|mysql_pipe 外层展开模式+空值兜底; +- 利润行集不含软删/孤儿账号(其消耗行不入行集,分摊分母走通道侧总量,守恒性如实降级)——边界注释留痕。 + +## 五、用户走查(七件套·本人走查项) + +- 走查脚本:`bash docs/acceptance/scripts/s2-walkthrough.sh 2>&1 | tee /tmp/s2-walk.log`(D2~D5 全域+自动清理); +- **结果:待用户执行后回填**(AI 预走查 27 PASS 见 §三;本人走查以此补正)。 + +## 六、验收结论 + +**S2-D5 通过(自动化门禁+真机全链+AI 预走查);用户走查项在途待回填。** S2 泳道收官判定见 `s2-closeout.md`。 diff --git a/docs/acceptance/scripts/s2-walkthrough.sh b/docs/acceptance/scripts/s2-walkthrough.sh index bce459bc..236a0af7 100755 --- a/docs/acceptance/scripts/s2-walkthrough.sh +++ b/docs/acceptance/scripts/s2-walkthrough.sh @@ -1,16 +1,21 @@ #!/usr/bin/env bash -# s2-walkthrough.sh S2-D2/D3 用户人工走查脚本(2026-11-14) +# s2-walkthrough.sh S2 用户人工走查脚本(D2/D3 2026-11-14;D4/D5+收官 2026-11-15) # -# 用途:把 S2-D2(消耗日汇总)/S2-D3(充值审核流)的验收从「AI 自证」补正为 -# 「用户本人走查」(七件套·本人走查项)。全程只读或可还原,跑完自动清理。 -# 前置:① gateway 在跑(:8080,make gw-start) ② sg docker 可用(dev MySQL 13306) +# 用途:把 S2 各日验收从「AI 自证」补正为「用户本人走查」(七件套·本人走查项)。 +# D2 消耗日汇总 / D3 充值审核流 / D4 出账+阶梯+结账+导出 / D5 利润+三方对账 +# (D4/D5 用 2026-10 空月,与真实当月数据隔离;全程可还原,跑完自动清理)。 +# 前置:① gateway 在跑(:8080,make gw-start,须含 D5 端点的二进制) +# ② sg docker 可用(dev MySQL 13306) ③ go 工具链(构建 settle-check) # 用法:bash docs/acceptance/scripts/s2-walkthrough.sh 2>&1 | tee /tmp/s2-walk.log -# 走查后将 /tmp/s2-walk.log 全文交回,回填 s2-d2.md/s2-d3.md 走查记录。 +# 走查后将 /tmp/s2-walk.log 全文交回,回填 s2-d2~d5.md/s2-closeout.md。 set -u GW=http://127.0.0.1:8080/api/v1 +ROOT="$(cd "$(dirname "$0")/../../.." && pwd)" step() { echo; echo "===== $1 ====="; } pass() { echo "[PASS] $1"; } fail() { echo "[FAIL] $1 (预期 ${2:-?},见上行输出)"; } +# mysql_pipe:stdin SQL → dev MySQL(多条语句稳态管道;-- 注释行自动忽略)。 +mysql_pipe() { sg docker -c 'docker exec -i go-sms-mysql mysql -uroot -proot123 gosms' "$@"; } # ---------- 步骤 0:签临时 JWT(dev secret,账号 1=admin) ---------- step "步骤0 签发临时 token(非侵入)" @@ -34,8 +39,8 @@ curl -s -m 3 -H "$AUTH" "$GW/billing/consume" | grep -q ISC:000 \ step "D2-1 种两条测试明细(账号1 成功+未知,通道1)" sg docker -c 'docker exec go-sms-mysql mysql -uroot -proot123 gosms -e "\ INSERT INTO message_detail (id,task_id,account_id,channel_id,mobile,content,status,business,fee,created_at) VALUES \ -(9302401110000000001,810001,1,1,\"13000000001\",\"s2-walk\",2,\"sms\",1.5,NOW()),\ -(9302401110000000002,810002,1,1,\"13000000002\",\"s2-walk\",4,\"sms\",2.5,NOW());"' >/dev/null 2>&1 \ +(7302401110000000001,810001,1,1,\"13000000001\",\"s2-walk\",2,\"sms\",1.5,NOW()),\ +(7302401110000000002,810002,1,1,\"13000000002\",\"s2-walk\",4,\"sms\",2.5,NOW());"' >/dev/null 2>&1 \ && pass "明细 2 条已插入" || fail "明细插入" step "D2-2 手动触发今日汇总(应 account_rows=1/channel_rows=1)" @@ -70,7 +75,7 @@ echo "$R" | grep -q '"total":1' && pass "customer 越权带参被覆盖收窄(to step "D2-5 状态迁移收敛(未知→成功,重刷后 unknown 0/succ 2)" sg docker -c 'docker exec go-sms-mysql mysql -uroot -proot123 gosms -e "\ -UPDATE message_detail SET status=2 WHERE id=9302401110000000002;"' >/dev/null 2>&1 +UPDATE message_detail SET status=2 WHERE id=7302401110000000002;"' >/dev/null 2>&1 curl -s -m 5 -X POST -H "$AUTH" -H 'Content-Type: application/json' \ -d "{\"date\":\"$(date +%F)\"}" "$GW/ops/settle/aggregate" >/dev/null R=$(curl -s -m 5 -H "$AUTH" "$GW/billing/consume?account_id=1") @@ -108,16 +113,126 @@ step "D3-5 审计留痕(module=billing)" sg docker -c 'docker exec go-sms-mysql mysql -uroot -proot123 gosms -e \ "SELECT module,action FROM system_operate_log WHERE module=\"billing\" ORDER BY id DESC LIMIT 3;"' 2>/dev/null +# ---------- D4 走查:出账+阶梯+结账+导出(2026-10 空月) ---------- +step "D4-1 种出账链数据(通道/上家 9101,账号1 价0.10,通道价0.05,明细2条 2026-10-15)" +printf '%s\n' \ +"INSERT INTO channel_upstream (id,name,contact,status,created_at,updated_at) VALUES (9101,'s2-walk-up','walk',1,NOW(),NOW());" \ +"INSERT INTO channel_channel (id,name,code,protocol,upstream_id,status,billing_mode,created_at,updated_at) VALUES (9101,'s2-walk-ch','S2WALK','http',9101,1,'success',NOW(),NOW());" \ +"INSERT INTO account_price (account_id,business,price,effective_at,created_at) VALUES (1,'sms',0.10,'2026-10-01 00:00:00',NOW());" \ +"INSERT INTO channel_price (channel_id,price,effective_at,created_at) VALUES (9101,0.05,'2026-10-01 00:00:00',NOW());" \ +"INSERT INTO message_detail (id,task_id,account_id,channel_id,mobile,content,status,business,fee,created_at) VALUES" \ +"(7302411150000000001,820101,1,9101,'13000000001','s2walk',2,'sms',1,'2026-10-15 12:00:00')," \ +"(7302411150000000002,820102,1,9101,'13000000002','s2walk',2,'sms',1,'2026-10-15 12:00:00');" \ +| mysql_pipe >/dev/null 2>&1 && pass "种子数据已插入" || fail "种子插入" + +step "D4-2 回补 2026-10-15 汇总(应 account_rows=1/channel_rows=1)" +R=$(curl -s -m 5 -X POST -H "$AUTH" -H 'Content-Type: application/json' \ + -d '{"date":"2026-10-15"}' "$GW/ops/settle/aggregate") +echo "$R" +echo "$R" | grep -q '"account_rows":1' && echo "$R" | grep -q '"channel_rows":1' \ + && pass "落账 1/1" || fail "落账行数" + +step "D4-3 生成下家账单(时间线价 2×0.10=0.2)" +R=$(curl -s -m 5 -X POST -H "$AUTH" -H 'Content-Type: application/json' \ + -d '{"period":"2026-10"}' "$GW/settle/customer/generate") +echo "$R" +echo "$R" | grep -q '"generated":1' && pass "生成 1 张" || fail "生成" +R=$(curl -s -m 5 -H "$AUTH" "$GW/settle/customer?period=2026-10") +echo "$R" +BID=$(echo "$R" | grep -o '"id":[0-9]*' | head -1 | cut -d: -f2) +echo "$R" | grep -q '"amount":0.2' \ + && pass "时间线价金额 0.2(bill id=$BID)" || fail "金额 0.2" + +step "D4-4 配阶梯(0 档 0.05)重算 → 整月覆写 0.1(Q2)" +R=$(curl -s -m 5 -X POST -H "$AUTH" -H 'Content-Type: application/json' \ + -d '{"owner_type":"account","owner_id":1,"tier_from":0,"price":0.05}' "$GW/settle/ladder") +echo "$R" +R=$(curl -s -m 5 -X POST -H "$AUTH" -H 'Content-Type: application/json' \ + -d '{"period":"2026-10"}' "$GW/settle/customer/generate") +echo "$R" +echo "$R" | grep -q '"recalculated":1' && pass "重算 1 张" || fail "重算" +curl -s -m 5 -H "$AUTH" "$GW/settle/customer?period=2026-10" | grep -q '"amount":0.1' \ + && pass "阶梯覆写金额 0.1" || fail "覆写金额" + +step "D4-5 确认→结账(SettleRecord direction=1/amount=0.1)" +curl -s -m 5 -X POST -H "$AUTH" "$GW/settle/customer/$BID/confirm" >/dev/null +R=$(curl -s -m 5 -X POST -H "$AUTH" -H 'Content-Type: application/json' \ + -d '{"pay_type":"bank"}' "$GW/settle/customer/$BID/settle") +echo "$R" +echo "$R" | grep -q '"direction":1' && echo "$R" | grep -q '"amount":0.1' \ + && pass "结账 SettleRecord 0.1" || fail "结账" +R=$(curl -s -m 5 -X POST -H "$AUTH" -H 'Content-Type: application/json' \ + -d '{"period":"2026-10"}' "$GW/settle/customer/generate") +echo "$R" | grep -q '"skipped":1' && pass "已结拒重算 skipped=1" || fail "终态幂等" + +step "D4-6 上家出账(US202610-9101,count=2,amount=2×0.05=0.1)" +R=$(curl -s -m 5 -X POST -H "$AUTH" -H 'Content-Type: application/json' \ + -d '{"period":"2026-10"}' "$GW/settle/upstream/generate") +echo "$R" +R=$(curl -s -m 5 -H "$AUTH" "$GW/settle/upstream?period=2026-10") +echo "$R" +echo "$R" | grep -q '"success_count":2' && echo "$R" | grep -q '"amount":0.1' \ + && pass "上家账单 2/0.1" || fail "上家账单" + +step "D4-7 导出下家账单 XLSX(PK 魔数,>1000 字节)" +curl -s -m 10 -H "$AUTH" -o /tmp/s2-walk-bill.xlsx "$GW/settle/customer/$BID/export" +SZ=$(wc -c < /tmp/s2-walk-bill.xlsx 2>/dev/null || echo 0) +head -c 2 /tmp/s2-walk-bill.xlsx | grep -q 'PK' && [ "$SZ" -gt 1000 ] \ + && pass "真 XLSX ${SZ}B" || fail "导出($SZ B)" + +# ---------- D5 走查:利润分析+三方对账 ---------- +step "D5-1 用户利润(阶梯不进分析:revenue=0.2 时间线价 vs 账单 0.1=口径差异)" +R=$(curl -s -m 5 -H "$AUTH" "$GW/stats/profit/users?date_from=2026-10-01&date_to=2026-10-31") +echo "$R" +echo "$R" | grep -q '"revenue":0.2' && echo "$R" | grep -q '"cost":0.1' \ + && echo "$R" | grep -q '"profit":0.1' && pass "rev0.2/cost0.1/profit0.1" || fail "用户利润" + +step "D5-2 通道利润(cost=2×0.05;revenue 分摊=全平台收入×2/2)" +R=$(curl -s -m 5 -H "$AUTH" "$GW/stats/profit/channels?date_from=2026-10-01&date_to=2026-10-31") +echo "$R" +echo "$R" | grep -q '"channel_id":9101' && echo "$R" | grep -q '"profit":0.1' \ + && pass "通道利润 0.1" || fail "通道利润" + +step "D5-3 customer 访问利润端点应 403" +R=$(curl -s -m 5 -H "Authorization: Bearer $TOKC" "$GW/stats/profit/users") +echo "$R" +echo "$R" | grep -q 'ISC:403' && pass "customer 403" || fail "利润权限门" + +step "D5-4 settle-check 三方对账(all_zero=true,退出码 0)" +(cd "$ROOT" && go build -o /tmp/settle-check-walk ./cmd/reconcile/settle-check) \ + && pass "settle-check 已构建" || fail "构建 settle-check" +(cd "$ROOT" && /tmp/settle-check-walk -period 2026-10 2>/dev/null; echo "EXIT=$?") | tee /tmp/s2-walk-reconcile.log +grep -q 'all_zero=true' /tmp/s2-walk-reconcile.log && grep -q 'EXIT=0' /tmp/s2-walk-reconcile.log \ + && pass "三方对账 diff=0(S2 出口判据)" || fail "三方对账" + # ---------- 清理还原 ---------- step "清理(明细/汇总行/订单/流水还原;审计行保留为走查证据)" -sg docker -c 'docker exec go-sms-mysql mysql -uroot -proot123 gosms -e "\ -DELETE FROM message_detail WHERE id IN (9302401110000000001,9302401110000000002);\ -DELETE FROM billing_consume_log WHERE stat_date=CURDATE();\ -DELETE FROM stats_channel_daily WHERE stat_date=CURDATE();\ -DELETE FROM billing_order WHERE order_no=\"$ON\";\ -DELETE FROM account_balance_log WHERE ref_id=\"$ON\";\ -UPDATE account_user SET balance=$B0 WHERE id=1;"' >/dev/null 2>&1 \ +# printf 双引号=外层展开 $ON/$B0(原 -e 单引号写法 $B0 内层展开为空致 SQL 语法错, +# 2026-11-15 D5 收官全脚本实跑暴露并修复);空值兜底防半程重跑。 +printf '%s\n' \ +"DELETE FROM message_detail WHERE id IN (7302401110000000001,7302401110000000002);" \ +"DELETE FROM billing_consume_log WHERE stat_date=CURDATE();" \ +"DELETE FROM stats_channel_daily WHERE stat_date=CURDATE();" \ +"DELETE FROM billing_order WHERE order_no='${ON:-}';" \ +"DELETE FROM account_balance_log WHERE ref_id='${ON:-}';" \ +"UPDATE account_user SET balance=${B0:-0} WHERE id=1;" \ +| mysql_pipe >/dev/null 2>&1 \ && pass "数据已还原" || fail "清理" +step "清理 D4/D5(2026-10 走查数据全量还原)" +printf '%s\n' \ +"DELETE FROM message_detail WHERE id IN (7302411150000000001,7302411150000000002);" \ +"DELETE FROM billing_consume_log WHERE stat_date='2026-10-15';" \ +"DELETE FROM stats_channel_daily WHERE stat_date='2026-10-15';" \ +"DELETE FROM account_price WHERE account_id=1 AND effective_at='2026-10-01';" \ +"DELETE FROM channel_price WHERE channel_id=9101;" \ +"DELETE FROM settle_ladder WHERE owner_type='account' AND owner_id=1 AND tier_from=0;" \ +"DELETE FROM settle_customer WHERE period='2026-10';" \ +"DELETE FROM settle_upstream WHERE period='2026-10';" \ +"DELETE FROM settle_record WHERE settle_no IN ('SC202610-1','US202610-9101');" \ +"DELETE FROM channel_channel WHERE id=9101 AND code='S2WALK';" \ +"DELETE FROM channel_upstream WHERE id=9101 AND name='s2-walk-up';" \ +| mysql_pipe >/dev/null 2>&1 && pass "D4/D5 数据已还原" || fail "D4/D5 清理" + echo -echo "===== 走查完成:以上 [PASS] 全绿即 S2-D2/D3 用户走查通过;任一 [FAIL] 请连同整份日志交回 =====" +echo "===== 走查完成:以上 [PASS] 全绿即 S2 全域(D2~D5)用户走查通过;任一 [FAIL] 请连同整份日志交回 =====" diff --git a/internal/api/http/v1/settle_handler.go b/internal/api/http/v1/settle_handler.go index 73150eb5..1272a073 100644 --- a/internal/api/http/v1/settle_handler.go +++ b/internal/api/http/v1/settle_handler.go @@ -65,6 +65,10 @@ func registerSettleRoutes(protected *gin.RouterGroup, deps Deps) { middleware.RequirePermission(deps.Perm, "settle", "write"), h.ladderUpdate) protected.DELETE("/settle/ladder/:id", middleware.RequirePermission(deps.Perm, "settle", "write"), h.ladderDelete) + // S2-D5:利润分析双端点(平台角色门——利润含全平台资金信息,group/customer + // 403,与充值订单列表同口径;查询类不挂 settle:write)。 + protected.GET("/stats/profit/users", h.profitUsers) + protected.GET("/stats/profit/channels", h.profitChannels) } // StartSettleAggregateJob v1 层装配入口(照 StartStatsRefresher 模式,仅 @@ -517,3 +521,88 @@ func (h *settleHandler) ladderDelete(c *gin.Context) { } response.Success(c, nil) } + +// ---- S2-D5:利润分析 ---- + +// parseProfitDates date_from/date_to 解析(YYYY-MM-DD;零值兜底=本月 1 号~今天, +// 月度利润视角)。返回 ok=false 时已写响应。 +func parseProfitDates(c *gin.Context) (from, to time.Time, ok bool) { + now := time.Now() + from = time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, now.Location()) + to = now + if s := c.Query("date_from"); s != "" { + d, err := time.ParseInLocation("2006-01-02", s, time.Local) + if err != nil { + response.Error(c, errs.InvalidParam.WithMsg("date_from 须为 YYYY-MM-DD")) + return time.Time{}, time.Time{}, false + } + from = d + } + if s := c.Query("date_to"); s != "" { + d, err := time.ParseInLocation("2006-01-02", s, time.Local) + if err != nil { + response.Error(c, errs.InvalidParam.WithMsg("date_to 须为 YYYY-MM-DD")) + return time.Time{}, time.Time{}, false + } + to = d + } + return from, to, true +} + +// profitUsers GET /stats/profit/users:用户利润(时间线价收入/成本分摊/直线下级 +// 返点 R4/子树过滤;平台角色)。口径详见 settle/profit.go 头注。 +func (h *settleHandler) profitUsers(c *gin.Context) { + if !statsIsPlatform(c) { + response.Error(c, errs.Forbidden.WithMsg("仅平台角色可查看利润分析")) + return + } + from, to, ok := parseProfitDates(c) + if !ok { + return + } + q := settle.UserProfitQuery{From: from, To: to, Page: 1, PageSize: 20} + if v, err := strconv.ParseInt(c.Query("parent_id"), 10, 64); err == nil && v > 0 { + q.ParentID = v + } + if v, err := strconv.Atoi(c.Query("page")); err == nil && v > 0 { + q.Page = v + } + if v, err := strconv.Atoi(c.Query("page_size")); err == nil && v > 0 { + q.PageSize = v + } + res, err := h.svc.UserProfit(c.Request.Context(), q) + if err != nil { + bizResp(c, err) + return + } + response.Success(c, res) +} + +// profitChannels GET /stats/profit/channels:通道利润(通道价成本直算/收入占比 +// 分摊;平台角色)。 +func (h *settleHandler) profitChannels(c *gin.Context) { + if !statsIsPlatform(c) { + response.Error(c, errs.Forbidden.WithMsg("仅平台角色可查看利润分析")) + return + } + from, to, ok := parseProfitDates(c) + if !ok { + return + } + q := settle.ChannelProfitQuery{From: from, To: to, Page: 1, PageSize: 20} + if v, err := strconv.ParseInt(c.Query("channel_id"), 10, 64); err == nil && v > 0 { + q.ChannelID = v + } + if v, err := strconv.Atoi(c.Query("page")); err == nil && v > 0 { + q.Page = v + } + if v, err := strconv.Atoi(c.Query("page_size")); err == nil && v > 0 { + q.PageSize = v + } + res, err := h.svc.ChannelProfit(c.Request.Context(), q) + if err != nil { + bizResp(c, err) + return + } + response.Success(c, res) +} diff --git a/internal/api/http/v1/settle_handler_test.go b/internal/api/http/v1/settle_handler_test.go index efe10909..96ca1210 100644 --- a/internal/api/http/v1/settle_handler_test.go +++ b/internal/api/http/v1/settle_handler_test.go @@ -39,7 +39,8 @@ func newSettleRouterWithPerm(t *testing.T, perm middleware.PermissionChecker) (* s.SetMaxOpenConns(1) } if err := db.AutoMigrate(&entity.MessageDetail{}, &entity.BillingConsumeLog{}, - &entity.StatsChannelDaily{}, &entity.AccountUser{}, &entity.BillingOrder{}); err != nil { + &entity.StatsChannelDaily{}, &entity.AccountUser{}, &entity.BillingOrder{}, + &entity.AccountPrice{}, &entity.ChannelPrice{}, &entity.ChannelChannel{}); err != nil { t.Fatal(err) } // 流水表手动建:idx_account_time 与 BillingOrder 同名,glebarez 索引名 @@ -368,3 +369,104 @@ func TestSettleBill_FullFlow(t *testing.T) { t.Fatalf("无 settle:write 应 403: %d %s", w.Code, w.Body.String()) } } + +// TestSettleProfit_Endpoints S2-D5:利润双端点——平台角色可查(数值口径), +// customer 403;坏日期 400。种子=helper 明细(账号1/100 今日各 1 成功,通道1) +// + 价(账号1=1.0,通道1=0.5):acc1 rev1.0/cost0.5(分摊 1.0×1/2)/profit0.5; +// ch1 succ2/cost1.0/rev1.0/profit0(账号100 无账号行,消耗行不入结果)。 +func TestSettleProfit_Endpoints(t *testing.T) { + rg, db, setClaims := newSettleRouter(t) + today := time.Now().Format("2006-01-02") + yday := time.Now().AddDate(0, 0, -1) + if err := db.Create(&[]entity.AccountPrice{ + {AccountID: 1, Business: "sms", Price: 1.0, EffectiveAt: yday}, + }).Error; err != nil { + t.Fatal(err) + } + if err := db.Create(&[]entity.ChannelPrice{ + {ChannelID: 1, Price: 0.5, EffectiveAt: yday}, + }).Error; err != nil { + t.Fatal(err) + } + if _, _, err := settle.NewService(db).AggregateDay(t.Context(), time.Now()); err != nil { + t.Fatal(err) + } + + setClaims(&middleware.Claims{AccountID: 1, Username: "admin", Roles: []string{"admin"}}) + w := httptest.NewRecorder() + rg.ServeHTTP(w, httptest.NewRequest(http.MethodGet, + "/api/v1/stats/profit/users?date_from="+today+"&date_to="+today, nil)) + if w.Code != 200 { + t.Fatalf("users status=%d body=%s", w.Code, w.Body.String()) + } + var users struct { + Data struct { + Total int64 `json:"total"` + List []struct { + AccountID int64 `json:"account_id"` + Revenue float64 `json:"revenue"` + Cost float64 `json:"cost"` + Profit float64 `json:"profit"` + } `json:"list"` + Summary struct { + TotalRevenue float64 `json:"total_revenue"` + } `json:"summary"` + } `json:"data"` + } + if err := json.Unmarshal(w.Body.Bytes(), &users); err != nil { + t.Fatal(err) + } + if users.Data.Total != 1 || len(users.Data.List) != 1 { + t.Fatalf("users 应 1 行(账号100 无账号实体): %+v", users.Data) + } + r := users.Data.List[0] + if r.AccountID != 1 || r.Revenue != 1.0 || r.Cost != 0.5 || r.Profit != 0.5 { + t.Fatalf("acc1 利润行错: %+v", r) + } + + w = httptest.NewRecorder() + rg.ServeHTTP(w, httptest.NewRequest(http.MethodGet, + "/api/v1/stats/profit/channels?date_from="+today+"&date_to="+today, nil)) + if w.Code != 200 { + t.Fatalf("channels status=%d body=%s", w.Code, w.Body.String()) + } + var channels struct { + Data struct { + Total int64 `json:"total"` + List []struct { + ChannelID int64 `json:"channel_id"` + SuccessCount int64 `json:"success_count"` + Revenue float64 `json:"revenue"` + Cost float64 `json:"cost"` + Profit float64 `json:"profit"` + } `json:"list"` + } `json:"data"` + } + if err := json.Unmarshal(w.Body.Bytes(), &channels); err != nil { + t.Fatal(err) + } + if channels.Data.Total != 1 || len(channels.Data.List) != 1 { + t.Fatalf("channels 应 1 行: %+v", channels.Data) + } + c := channels.Data.List[0] + if c.ChannelID != 1 || c.SuccessCount != 2 || c.Revenue != 1.0 || c.Cost != 1.0 || c.Profit != 0 { + t.Fatalf("ch1 利润行错: %+v", c) + } + + // customer → 403;坏日期 → 400。 + setClaims(&middleware.Claims{AccountID: 100, Username: "cust", Roles: []string{"customer"}}) + for _, path := range []string{"/stats/profit/users", "/stats/profit/channels"} { + w = httptest.NewRecorder() + rg.ServeHTTP(w, httptest.NewRequest(http.MethodGet, "/api/v1"+path, nil)) + if w.Code != http.StatusForbidden { + t.Fatalf("customer %s 应 403: %d %s", path, w.Code, w.Body.String()) + } + } + setClaims(&middleware.Claims{AccountID: 1, Username: "admin", Roles: []string{"admin"}}) + w = httptest.NewRecorder() + rg.ServeHTTP(w, httptest.NewRequest(http.MethodGet, + "/api/v1/stats/profit/users?date_from=2026/11/14", nil)) + if w.Code == 200 { + t.Fatalf("坏日期应 4xx: %d %s", w.Code, w.Body.String()) + } +} diff --git a/internal/service/settle/profit.go b/internal/service/settle/profit.go new file mode 100644 index 00000000..7513e2f1 --- /dev/null +++ b/internal/service/settle/profit.go @@ -0,0 +1,342 @@ +// profit.go S2-D5:利润分析引擎——用户(含下级树/返点)与通道双视角。 +// +// 口径(与 D4 出账同源、分析性差异如实声明): +// - revenue(用户)=Σ(日成功条数×PriceAtAccount 时间线价)——与 GenerateCustomerBills +// 同口径;**阶梯不进分析**(阶梯是月结出账的整月覆写项,分析用时间线价, +// 启用阶梯的账号利润行与账单金额可能不同,属口径差异非数据错误); +// - cost(用户)=全平台通道成本×该账号成功条数/全平台通道成功条数——**占比分摊** +// (billing_consume_log 与 stats_channel_daily 无账号×通道交叉粒度,精确归因 +// 需新增事实粒度,留 S3+;分摊在总量守恒下误差可控); +// - rebate(R4)=Σ 直线下级窗口结算额×下级 rebate_rate——该账号(作为上级)的 +// 返点收入,等价于平台让利支出;**历史不重算**:返点不落档,每次查询按当前 +// 树(直线下级)+当前 rate×窗口推导,不存在回溯修正动作(换上级只影响未来 +// 窗口的归属); +// - profit(用户)=revenue-cost+rebate;平台净利(summary)=Σrevenue-Σcost-Σrebate +// (返点从平台口径流出、计入上级账号口径); +// - 通道侧:cost=Σ(日成功×PriceAtChannel);revenue=全平台用户收入×通道成功占比 +// (同分摊口径,与用户侧共用同一分母,Σ通道revenue=Σ用户revenue 恒成立)。 +// 单位:金额均=元(R6;条→元换算仍只在 price.go)。 +package settle + +import ( + "context" + "sort" + "strconv" + "strings" + "time" + + "go-sms/internal/model/entity" + errs "go-sms/internal/pkg/errors" +) + +// dayWindow 分析窗口归一:零值兜底(From=本月 1 号/To=今天),闭区间转 [lo,hi) 半开。 +func dayWindow(from, to time.Time) (time.Time, time.Time) { + now := time.Now() + if to.IsZero() { + to = now + } + hi := time.Date(to.Year(), to.Month(), to.Day(), 0, 0, 0, 0, to.Location()). + AddDate(0, 0, 1) // 含当日 + if from.IsZero() { + from = time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, now.Location()) + } + lo := time.Date(from.Year(), from.Month(), from.Day(), 0, 0, 0, 0, from.Location()) + return lo, hi +} + +// UserProfitQuery 用户利润查询条件。 +type UserProfitQuery struct { + From time.Time // 闭区间起(零值=本月 1 号) + To time.Time // 闭区间止(零值=今天) + ParentID int64 // >0:仅该账号为根的子树(Path 前缀) + Page int + PageSize int +} + +// UserProfitRow 单账号利润行。 +type UserProfitRow struct { + AccountID int64 `json:"account_id"` + Username string `json:"username"` + Role string `json:"role"` + SuccessCount int64 `json:"success_count"` + Revenue float64 `json:"revenue"` // 应收(元,时间线价) + Cost float64 `json:"cost"` // 通道成本分摊(元) + Rebate float64 `json:"rebate"` // 直线下级返点(R4) + Profit float64 `json:"profit"` // revenue-cost+rebate +} + +// UserProfitSummary 汇总(与列表同 scope:parent_id 过滤后)。 +type UserProfitSummary struct { + Count int `json:"count"` + TotalRevenue float64 `json:"total_revenue"` + TotalCost float64 `json:"total_cost"` + TotalRebate float64 `json:"total_rebate"` + PlatformProfit float64 `json:"platform_profit"` // Σrevenue-Σcost-Σrebate +} + +// UserProfitResult 用户利润结果集。 +type UserProfitResult struct { + List []UserProfitRow `json:"list"` + Total int64 `json:"total"` + Summary UserProfitSummary `json:"summary"` +} + +// UserProfit 用户利润分析。行集=窗口内有消耗的账号 ∪ 收到返点的上级 +// (无自身流量但下级活跃的代理也有行);按 revenue 降序分页(内存排序, +// 账号量级=运营开户数,非明细量级)。 +func (s *Service) UserProfit(ctx context.Context, q UserProfitQuery) (*UserProfitResult, error) { + lo, hi := dayWindow(q.From, q.To) + + // ① 消耗事实源(账号×业务×天)→ 逐行业务线时间线计价。 + var consumes []entity.BillingConsumeLog + if err := s.db.WithContext(ctx). + Where("stat_date >= ? AND stat_date < ?", lo, hi). + Order("stat_date").Find(&consumes).Error; err != nil { + return nil, err + } + var accounts []entity.AccountUser + if err := s.db.WithContext(ctx).Find(&accounts).Error; err != nil { + return nil, err + } + accByID := make(map[int64]*entity.AccountUser, len(accounts)) + for i := range accounts { + accByID[accounts[i].ID] = &accounts[i] + } + byID := make(map[int64]*UserProfitRow) + order := make([]int64, 0) + get := func(id int64) *UserProfitRow { + if r, ok := byID[id]; ok { + return r + } + acc := accByID[id] + if acc == nil { // 软删/孤儿消耗行:不入行集(分摊分母走通道侧) + return nil + } + r := &UserProfitRow{AccountID: id, Username: acc.Username, Role: acc.Role} + byID[id] = r + order = append(order, id) + return r + } + for _, c := range consumes { + r := get(c.AccountID) + if r == nil { + continue + } + r.SuccessCount += int64(c.SuccessCount) + price, _ := s.PriceAtAccount(ctx, c.AccountID, c.Business, c.StatDate) + r.Revenue += float64(c.SuccessCount) * price + } + + // ② 通道成本总额 + 通道侧成功总数(分摊分母,与通道利润同源)。 + channelCost, channelSuccess, err := s.channelCostTotal(ctx, lo, hi) + if err != nil { + return nil, err + } + for _, id := range order { + r := byID[id] + if channelSuccess > 0 { + r.Cost = channelCost * float64(r.SuccessCount) / float64(channelSuccess) + } + } + + // ③ 返点(R4):直线下级窗口结算额×下级 rebate_rate → 计入上级行。 + for _, id := range order { + child := byID[id] + if child.Revenue <= 0 { + continue + } + acc := accByID[id] + if acc == nil || acc.RebateRate <= 0 || acc.ParentID <= 0 { + continue + } + if parent := get(acc.ParentID); parent != nil { + parent.Rebate += child.Revenue * acc.RebateRate + } + } + + // ④ 子树过滤(Path 物化路径前缀;path 空兜底 "//")。 + if q.ParentID > 0 { + var root entity.AccountUser + if err := s.db.WithContext(ctx).First(&root, q.ParentID).Error; err != nil { + return nil, errs.NotFound.WithMsg("parent_id 账号不存在") + } + prefix := root.Path + if prefix == "" { + prefix = "/" + strconv.FormatInt(root.ID, 10) + "/" + } + filtered := make([]int64, 0, len(order)) + for _, id := range order { + if id == root.ID || strings.HasPrefix(accByID[id].Path, prefix) { + filtered = append(filtered, id) + } + } + order = filtered + } + + rows := make([]UserProfitRow, 0, len(order)) + sum := UserProfitSummary{} + for _, id := range order { + r := byID[id] + r.Profit = r.Revenue - r.Cost + r.Rebate + sum.Count++ + sum.TotalRevenue += r.Revenue + sum.TotalCost += r.Cost + sum.TotalRebate += r.Rebate + rows = append(rows, *r) + } + sum.PlatformProfit = sum.TotalRevenue - sum.TotalCost - sum.TotalRebate + sort.Slice(rows, func(i, j int) bool { + if rows[i].Revenue != rows[j].Revenue { + return rows[i].Revenue > rows[j].Revenue + } + return rows[i].AccountID < rows[j].AccountID + }) + total := int64(len(rows)) + if q.Page <= 0 { + q.Page = 1 + } + if q.PageSize <= 0 || q.PageSize > 100 { + q.PageSize = 20 + } + start := (q.Page - 1) * q.PageSize + if start >= len(rows) { + rows = []UserProfitRow{} + } else if start+q.PageSize < len(rows) { + rows = rows[start : start+q.PageSize] + } else { + rows = rows[start:] + } + return &UserProfitResult{List: rows, Total: total, Summary: sum}, nil +} + +// channelCostTotal 窗口内全平台通道成本(Σ日成功×PriceAtChannel)与通道侧 +// 成功总条数(分摊分母)。 +func (s *Service) channelCostTotal(ctx context.Context, lo, hi time.Time) (cost float64, success int64, err error) { + var rows []entity.StatsChannelDaily + if err = s.db.WithContext(ctx). + Where("stat_date >= ? AND stat_date < ?", lo, hi). + Order("stat_date").Find(&rows).Error; err != nil { + return 0, 0, err + } + for _, r := range rows { + success += int64(r.SuccessCount) + price, _ := s.PriceAtChannel(ctx, r.ChannelID, r.StatDate) + cost += float64(r.SuccessCount) * price + } + return cost, success, nil +} + +// ChannelProfitQuery 通道利润查询条件。 +type ChannelProfitQuery struct { + From time.Time + To time.Time + ChannelID int64 // 0=全部 + Page int + PageSize int +} + +// ChannelProfitRow 单通道利润行。 +type ChannelProfitRow struct { + ChannelID int64 `json:"channel_id"` + Name string `json:"name"` + UpstreamID int64 `json:"upstream_id"` + SuccessCount int64 `json:"success_count"` + Revenue float64 `json:"revenue"` // 全平台用户收入×成功占比(分摊) + Cost float64 `json:"cost"` // Σ日成功×通道时间线价 + Profit float64 `json:"profit"` +} + +// ChannelProfitResult 通道利润结果集。 +type ChannelProfitResult struct { + List []ChannelProfitRow `json:"list"` + Total int64 `json:"total"` +} + +// ChannelProfit 通道利润分析:成本=通道价直算;收入=占比分摊(无账号×通道 +// 交叉粒度事实源,见文件头注);Σ通道 revenue=Σ用户 revenue 恒成立。 +func (s *Service) ChannelProfit(ctx context.Context, q ChannelProfitQuery) (*ChannelProfitResult, error) { + lo, hi := dayWindow(q.From, q.To) + + var stats []entity.StatsChannelDaily + db := s.db.WithContext(ctx). + Where("stat_date >= ? AND stat_date < ?", lo, hi). + Order("stat_date") + if q.ChannelID > 0 { + db = db.Where("channel_id = ?", q.ChannelID) + } + if err := db.Find(&stats).Error; err != nil { + return nil, err + } + var channels []entity.ChannelChannel + if err := s.db.WithContext(ctx).Find(&channels).Error; err != nil { + return nil, err + } + chByID := make(map[int64]*entity.ChannelChannel, len(channels)) + for i := range channels { + chByID[channels[i].ID] = &channels[i] + } + + // 全平台用户收入与通道侧成功总数(收入分摊分母;不随 channel_id 过滤,保证守恒)。 + var totalRevenue float64 + var consumes []entity.BillingConsumeLog + if err := s.db.WithContext(ctx). + Where("stat_date >= ? AND stat_date < ?", lo, hi).Find(&consumes).Error; err != nil { + return nil, err + } + for _, c := range consumes { + price, _ := s.PriceAtAccount(ctx, c.AccountID, c.Business, c.StatDate) + totalRevenue += float64(c.SuccessCount) * price + } + _, channelSuccess, err := s.channelCostTotal(ctx, lo, hi) + if err != nil { + return nil, err + } + + byID := map[int64]*ChannelProfitRow{} + order := make([]int64, 0) + for _, r := range stats { + row := byID[r.ChannelID] + if row == nil { + row = &ChannelProfitRow{ChannelID: r.ChannelID} + if ch := chByID[r.ChannelID]; ch != nil { + row.Name, row.UpstreamID = ch.Name, ch.UpstreamID + } + byID[r.ChannelID] = row + order = append(order, r.ChannelID) + } + row.SuccessCount += int64(r.SuccessCount) + price, _ := s.PriceAtChannel(ctx, r.ChannelID, r.StatDate) + row.Cost += float64(r.SuccessCount) * price + } + rows := make([]ChannelProfitRow, 0, len(order)) + for _, id := range order { + r := byID[id] + if channelSuccess > 0 { + r.Revenue = totalRevenue * float64(r.SuccessCount) / float64(channelSuccess) + } + r.Profit = r.Revenue - r.Cost + rows = append(rows, *r) + } + sort.Slice(rows, func(i, j int) bool { + if rows[i].SuccessCount != rows[j].SuccessCount { + return rows[i].SuccessCount > rows[j].SuccessCount + } + return rows[i].ChannelID < rows[j].ChannelID + }) + total := int64(len(rows)) + if q.Page <= 0 { + q.Page = 1 + } + if q.PageSize <= 0 || q.PageSize > 100 { + q.PageSize = 20 + } + start := (q.Page - 1) * q.PageSize + if start >= len(rows) { + rows = []ChannelProfitRow{} + } else if start+q.PageSize < len(rows) { + rows = rows[start : start+q.PageSize] + } else { + rows = rows[start:] + } + return &ChannelProfitResult{List: rows, Total: total}, nil +} diff --git a/internal/service/settle/profit_test.go b/internal/service/settle/profit_test.go new file mode 100644 index 00000000..1d444d78 --- /dev/null +++ b/internal/service/settle/profit_test.go @@ -0,0 +1,241 @@ +package settle + +// profit_test.go S2-D5:利润分析单测——时间线价收入/成本占比分摊/直线下级 +// 返点(R4,单级)/子树过滤(Path 前缀)/汇总守恒;通道侧成本直算+收入分摊。 +// 口径差异声明:阶梯不进分析(与账单金额的差=口径差异,见 profit.go 头注)。 + +import ( + "context" + "testing" + "time" + + "gorm.io/gorm" + + "go-sms/internal/model/entity" +) + +// newProfitDB 出账全家桶 + 账号树。 +func newProfitDB(t *testing.T) *gorm.DB { + t.Helper() + db := newBillDB(t) + if err := db.AutoMigrate(&entity.AccountUser{}); err != nil { + t.Fatal(err) + } + return db +} + +// seedProfitTree 树:1(root)→{10(rate .10),12(rate 0)};10→11(rate .20)。 +// 价:acc1=0.10 / acc10=0.20 / acc11=0.30 / acc12 无价(Q1:0 元入账)。 +func seedProfitTree(t *testing.T, db *gorm.DB) { + t.Helper() + d := func(s string) time.Time { + v, _ := time.ParseInLocation("2006-01-02", s, time.Local) + return v + } + if err := db.Create(&[]entity.AccountUser{ + {Model: entity.Model{ID: 1}, Username: "root", Role: "group", Path: "/1/"}, + {Model: entity.Model{ID: 10}, Username: "a10", Role: "customer", ParentID: 1, Path: "/1/10/", RebateRate: 0.10}, + {Model: entity.Model{ID: 11}, Username: "a11", Role: "customer", ParentID: 10, Path: "/1/10/11/", RebateRate: 0.20}, + {Model: entity.Model{ID: 12}, Username: "a12", Role: "customer", ParentID: 1, Path: "/1/12/"}, + }).Error; err != nil { + t.Fatal(err) + } + if err := db.Create(&[]entity.AccountPrice{ + {AccountID: 1, Business: "sms", Price: 0.10, EffectiveAt: d("2026-11-01")}, + {AccountID: 10, Business: "sms", Price: 0.20, EffectiveAt: d("2026-11-01")}, + {AccountID: 11, Business: "sms", Price: 0.30, EffectiveAt: d("2026-11-01")}, + }).Error; err != nil { + t.Fatal(err) + } +} + +// seedProfitFlow 消耗(acc1:100/acc10:50/acc11:40/acc12:10 无价)+ 通道侧 +// (ch1:150 + ch2:50=200,成本价均 0.04 → 总成本 8)。账号/通道成功总数一致=200。 +func seedProfitFlow(t *testing.T, db *gorm.DB) { + t.Helper() + d := func(s string) time.Time { + v, _ := time.ParseInLocation("2006-01-02", s, time.Local) + return v + } + if err := db.Create(&[]entity.BillingConsumeLog{ + {AccountID: 1, Business: "sms", StatDate: d("2026-11-10"), SuccessCount: 100}, + {AccountID: 10, Business: "sms", StatDate: d("2026-11-10"), SuccessCount: 50}, + {AccountID: 11, Business: "sms", StatDate: d("2026-11-20"), SuccessCount: 40}, + {AccountID: 12, Business: "sms", StatDate: d("2026-11-10"), SuccessCount: 10}, + }).Error; err != nil { + t.Fatal(err) + } + if err := db.Create(&[]entity.ChannelChannel{ + {Model: entity.Model{ID: 1}, Name: "c1", Code: "pfc1", UpstreamID: 7}, + {Model: entity.Model{ID: 2}, Name: "c2", Code: "pfc2"}, + }).Error; err != nil { + t.Fatal(err) + } + if err := db.Create(&[]entity.ChannelPrice{ + {ChannelID: 1, Price: 0.04, EffectiveAt: d("2026-11-01")}, + {ChannelID: 2, Price: 0.04, EffectiveAt: d("2026-11-01")}, + }).Error; err != nil { + t.Fatal(err) + } + if err := db.Create(&[]entity.StatsChannelDaily{ + {ChannelID: 1, StatDate: d("2026-11-10"), SuccessCount: 150}, + {ChannelID: 2, StatDate: d("2026-11-20"), SuccessCount: 50}, + }).Error; err != nil { + t.Fatal(err) + } +} + +// findRow 按账号取行。 +func findRow(t *testing.T, res *UserProfitResult, id int64) UserProfitRow { + t.Helper() + for _, r := range res.List { + if r.AccountID == id { + return r + } + } + t.Fatalf("账号 %d 不在结果中: %+v", id, res.List) + return UserProfitRow{} +} + +// TestProfit_Users 时间线价收入+占比分摊成本+单级返点+子树过滤+平台净利守恒。 +// +// 期望:acc1 rev10/cost4/rebate1.0(=子10 rev10×0.10)/profit7; +// acc10 rev10/cost2/rebate2.4(=子11 rev12×0.20)/profit10.4; +// acc11 rev12/cost1.6/profit10.4;acc12 无价 rev0/cost0.4/profit-0.4; +// 汇总 rev32/cost8/rebate3.4/平台净利 32-8-3.4=20.6。 +func TestProfit_Users(t *testing.T) { + db := newProfitDB(t) + seedProfitTree(t, db) + seedProfitFlow(t, db) + svc := NewService(db) + ctx := context.Background() + from, _ := time.ParseInLocation("2006-01-02", "2026-11-01", time.Local) + to, _ := time.ParseInLocation("2006-01-02", "2026-11-30", time.Local) + + res, err := svc.UserProfit(ctx, UserProfitQuery{From: from, To: to}) + if err != nil { + t.Fatal(err) + } + if res.Total != 4 || res.Summary.Count != 4 { + t.Fatalf("行数=%d/%d 期望 4", res.Total, res.Summary.Count) + } + r1 := findRow(t, res, 1) + if r1.SuccessCount != 100 || !feq(r1.Revenue, 10) || !feq(r1.Cost, 4) || + !feq(r1.Rebate, 1.0) || !feq(r1.Profit, 7) { + t.Fatalf("acc1 错: %+v", r1) + } + r10 := findRow(t, res, 10) + if !feq(r10.Revenue, 10) || !feq(r10.Cost, 2) || !feq(r10.Rebate, 2.4) || !feq(r10.Profit, 10.4) { + t.Fatalf("acc10 错: %+v", r10) + } + r11 := findRow(t, res, 11) + if !feq(r11.Revenue, 12) || !feq(r11.Cost, 1.6) || r11.Rebate != 0 || !feq(r11.Profit, 10.4) { + t.Fatalf("acc11 错: %+v", r11) + } + r12 := findRow(t, res, 12) + if r12.Revenue != 0 || !feq(r12.Cost, 0.4) || !feq(r12.Profit, -0.4) { + t.Fatalf("acc12 错(无价 0 元入账): %+v", r12) + } + s := res.Summary + if !feq(s.TotalRevenue, 32) || !feq(s.TotalCost, 8) || !feq(s.TotalRebate, 3.4) || + !feq(s.PlatformProfit, 20.6) { + t.Fatalf("汇总错: %+v", s) + } + + // 子树过滤 parent_id=10:仅 10/11 两行,汇总随 scope 收窄。 + res, err = svc.UserProfit(ctx, UserProfitQuery{From: from, To: to, ParentID: 10}) + if err != nil { + t.Fatal(err) + } + if res.Total != 2 || res.Summary.Count != 2 { + t.Fatalf("子树行数=%d 期望 2", res.Total) + } + findRow(t, res, 10) + findRow(t, res, 11) + if !feq(res.Summary.TotalRevenue, 22) || !feq(res.Summary.TotalCost, 3.6) || + !feq(res.Summary.TotalRebate, 2.4) { + t.Fatalf("子树汇总错: %+v", res.Summary) + } + + // parent 不存在 → 404 业务错误。 + if _, err := svc.UserProfit(ctx, UserProfitQuery{From: from, To: to, ParentID: 999}); err == nil { + t.Fatal("parent_id=999 应报错") + } +} + +// TestProfit_Users_ParentWithoutTraffic 无自身流量的上级也有行(代理纯返点场景)。 +func TestProfit_Users_ParentWithoutTraffic(t *testing.T) { + db := newProfitDB(t) + d := func(s string) time.Time { + v, _ := time.ParseInLocation("2006-01-02", s, time.Local) + return v + } + if err := db.Create(&[]entity.AccountUser{ + {Model: entity.Model{ID: 20}, Username: "agent", Role: "group", Path: "/20/"}, + {Model: entity.Model{ID: 21}, Username: "c21", Role: "customer", ParentID: 20, Path: "/20/21/", RebateRate: 0.5}, + }).Error; err != nil { + t.Fatal(err) + } + if err := db.Create(&[]entity.AccountPrice{ + {AccountID: 21, Business: "sms", Price: 0.10, EffectiveAt: d("2026-11-01")}, + }).Error; err != nil { + t.Fatal(err) + } + if err := db.Create(&[]entity.BillingConsumeLog{ + {AccountID: 21, Business: "sms", StatDate: d("2026-11-10"), SuccessCount: 100}, + }).Error; err != nil { + t.Fatal(err) + } + res, err := NewService(db).UserProfit(context.Background(), UserProfitQuery{ + From: d("2026-11-01"), To: d("2026-11-30"), + }) + if err != nil { + t.Fatal(err) + } + if res.Total != 2 { + t.Fatalf("行数=%d 期望 2(agent+c21)", res.Total) + } + agent := findRow(t, res, 20) + if agent.SuccessCount != 0 || agent.Revenue != 0 || !feq(agent.Rebate, 5.0) || !feq(agent.Profit, 5.0) { + t.Fatalf("agent 行错(纯返点): %+v", agent) + } +} + +// TestProfit_Channels 通道成本直算+收入占比分摊+channel_id 过滤。 +// ch1: succ150 cost6(150×0.04) rev24(32×150/200) profit18; +// ch2: succ50 cost2 rev8 profit6。 +func TestProfit_Channels(t *testing.T) { + db := newProfitDB(t) + seedProfitTree(t, db) + seedProfitFlow(t, db) + svc := NewService(db) + ctx := context.Background() + from, _ := time.ParseInLocation("2006-01-02", "2026-11-01", time.Local) + to, _ := time.ParseInLocation("2006-01-02", "2026-11-30", time.Local) + + res, err := svc.ChannelProfit(ctx, ChannelProfitQuery{From: from, To: to}) + if err != nil { + t.Fatal(err) + } + if res.Total != 2 { + t.Fatalf("通道行数=%d 期望 2", res.Total) + } + if res.List[0].ChannelID != 1 { // succ 降序 + t.Fatalf("排序错: %+v", res.List) + } + c1 := res.List[0] + if c1.Name != "c1" || c1.UpstreamID != 7 || c1.SuccessCount != 150 || + !feq(c1.Cost, 6) || !feq(c1.Revenue, 24) || !feq(c1.Profit, 18) { + t.Fatalf("ch1 错: %+v", c1) + } + c2 := res.List[1] + if !feq(c2.Cost, 2) || !feq(c2.Revenue, 8) || !feq(c2.Profit, 6) { + t.Fatalf("ch2 错: %+v", c2) + } + + // channel_id 过滤。 + res, err = svc.ChannelProfit(ctx, ChannelProfitQuery{From: from, To: to, ChannelID: 2}) + if err != nil || res.Total != 1 || res.List[0].ChannelID != 2 { + t.Fatalf("过滤错: %+v err=%v", res, err) + } +} diff --git a/internal/service/settle/reconcile.go b/internal/service/settle/reconcile.go new file mode 100644 index 00000000..81c389b5 --- /dev/null +++ b/internal/service/settle/reconcile.go @@ -0,0 +1,235 @@ +// reconcile.go S2-D5:三方对账——明细直查 vs 日汇总(R2 事实源)vs 结算单, +// diff=0 为 S2 泳道出口判据(《重建计划》S2 行)。 +// +// 比对口径(全部为**条数**,status=2 成功侧): +// - 账号三方:message_detail 直查聚合 ↔ billing_consume_log 月和 ↔ +// settle_customer.success_count(有单才比;未生成=流程状态,BillMissing +// 单列不判失败); +// - 通道两方:message_detail 直查聚合 ↔ stats_channel_daily 月和; +// - 上家:settle_upstream 快照 ↔ 日汇总×**当前**通道归并/billing_mode 重推 +// (Q4/Q6 快照语义:生成后换绑/改模式/重刷会如实暴露差异——这正是对账目的); +// - 金额不比:结算单金额是出账时点价/阶梯快照(Q6),事后调价重算必生噪音; +// 金额核对走账单导出 XLSX 人工比对(D4 已验)。 +// 注意:明细热窗仅 5 天(S4 分区规划)——历史月的"明细直查"侧在数据清退后 +// 不再完整,届时对账基线=日汇总 vs 结算单两方;当前 dev 明细全量在库。 +package settle + +import ( + "context" + "time" + + "go-sms/internal/model/entity" +) + +// ReconcileSummary 对账汇总计数。 +type ReconcileSummary struct { + AccountsChecked int `json:"accounts_checked"` // 账号并集(明细∪汇总∪账单) + AccountDiffs int `json:"account_diffs"` // 账号侧差异行数 + BillMissing int `json:"bill_missing"` // 有消耗无账单(流程状态,不判失败) + ChannelsChecked int `json:"channels_checked"` // 通道并集(明细∪汇总) + ChannelDiffs int `json:"channel_diffs"` // 通道侧差异行数 + UpstreamsChecked int `json:"upstreams_checked"` // 上家并集(重推∪账单) + UpstreamDiffs int `json:"upstream_diffs"` // 上家侧差异行数(缺账单不计入) + AllZero bool `json:"all_zero"` // 三方差异全零(S2 出口判据) +} + +// AccountDiffRow 账号对账行(仅差异/缺单账号入列)。 +type AccountDiffRow struct { + AccountID int64 `json:"account_id"` + DetailSuccess int64 `json:"detail_success"` // 明细直查 + ConsumeSuccess int64 `json:"consume_success"` // 日汇总 + BillSuccess *int64 `json:"bill_success"` // 结算单(nil=未生成) +} + +// ChannelDiffRow 通道对账行(仅差异通道入列)。 +type ChannelDiffRow struct { + ChannelID int64 `json:"channel_id"` + DetailSuccess int64 `json:"detail_success"` + DailySuccess int64 `json:"daily_success"` +} + +// UpstreamDiffRow 上家对账行(差异/缺单入列;重推=当前归并×当前口径)。 +type UpstreamDiffRow struct { + UpstreamID int64 `json:"upstream_id"` + DailyCount int64 `json:"daily_count"` // 日汇总重推 + BillSuccess *int64 `json:"bill_success"` // 账单快照(nil=未生成) +} + +// ReconcileReport 对账报告(AsOf 时点;rows 仅异常行,全对=空)。 +type ReconcileReport struct { + Period string `json:"period"` + AsOf time.Time `json:"as_of"` + Accounts []AccountDiffRow `json:"accounts"` + Channels []ChannelDiffRow `json:"channels"` + Upstreams []UpstreamDiffRow `json:"upstreams"` + Summary ReconcileSummary `json:"summary"` +} + +// successAgg 明细直查聚合 DTO。 +type successAgg struct { + ID int64 + N int64 +} + +// detailSuccessBy 明细直查:窗口内按 key 维度聚合成功条数(ground truth)。 +func (s *Service) detailSuccessBy(ctx context.Context, lo, hi time.Time, key string) (map[int64]int64, error) { + var rows []successAgg + if err := s.db.WithContext(ctx).Table("message_detail"). + Select(key+" AS id, COALESCE(SUM(status = 2), 0) AS n"). + Where("created_at >= ? AND created_at < ?", lo, hi). + Group(key).Scan(&rows).Error; err != nil { + return nil, err + } + out := make(map[int64]int64, len(rows)) + for _, r := range rows { + out[r.ID] = r.N + } + return out, nil +} + +// ReconcilePeriod 三方对账(period=YYYY-MM)。 +func (s *Service) ReconcilePeriod(ctx context.Context, period string) (*ReconcileReport, error) { + lo, hi, err := PeriodBounds(period) + if err != nil { + return nil, err + } + rep := &ReconcileReport{Period: period, AsOf: time.Now(), + Accounts: []AccountDiffRow{}, Channels: []ChannelDiffRow{}, Upstreams: []UpstreamDiffRow{}} + + // ① 账号三方:明细直查 ↔ 消耗日汇总 ↔ 下家结算单。 + detailAcc, err := s.detailSuccessBy(ctx, lo, hi, "account_id") + if err != nil { + return nil, err + } + consumeAcc := map[int64]int64{} + var consumeRows []entity.BillingConsumeLog + if err := s.db.WithContext(ctx). + Where("stat_date >= ? AND stat_date < ?", lo, hi).Find(&consumeRows).Error; err != nil { + return nil, err + } + for _, r := range consumeRows { + consumeAcc[r.AccountID] += int64(r.SuccessCount) + } + var bills []entity.SettleCustomer + if err := s.db.WithContext(ctx). + Where("period = ?", period).Find(&bills).Error; err != nil { + return nil, err + } + billAcc := map[int64]entity.SettleCustomer{} + for _, b := range bills { + billAcc[b.AccountID] = b + } + accUnion := map[int64]struct{}{} + for id := range detailAcc { + accUnion[id] = struct{}{} + } + for id := range consumeAcc { + accUnion[id] = struct{}{} + } + for id := range billAcc { + accUnion[id] = struct{}{} + } + rep.Summary.AccountsChecked = len(accUnion) + for id := range accUnion { + d, c := detailAcc[id], consumeAcc[id] + bill, hasBill := billAcc[id] + billMismatch := hasBill && int64(bill.SuccessCount) != c + if d != c || billMismatch { + row := AccountDiffRow{AccountID: id, DetailSuccess: d, ConsumeSuccess: c} + if hasBill { + bs := int64(bill.SuccessCount) + row.BillSuccess = &bs + } + rep.Accounts = append(rep.Accounts, row) + rep.Summary.AccountDiffs++ + } else if !hasBill { + rep.Accounts = append(rep.Accounts, + AccountDiffRow{AccountID: id, DetailSuccess: d, ConsumeSuccess: c}) + rep.Summary.BillMissing++ + } + } + + // ② 通道两方:明细直查 ↔ 通道日汇总。 + detailCh, err := s.detailSuccessBy(ctx, lo, hi, "channel_id") + if err != nil { + return nil, err + } + dailyCh := map[int64]int64{} + var statRows []entity.StatsChannelDaily + if err := s.db.WithContext(ctx). + Where("stat_date >= ? AND stat_date < ?", lo, hi).Find(&statRows).Error; err != nil { + return nil, err + } + for _, r := range statRows { + dailyCh[r.ChannelID] += int64(r.SuccessCount) + } + chUnion := map[int64]struct{}{} + for id := range detailCh { + chUnion[id] = struct{}{} + } + for id := range dailyCh { + chUnion[id] = struct{}{} + } + rep.Summary.ChannelsChecked = len(chUnion) + for id := range chUnion { + if detailCh[id] != dailyCh[id] { + rep.Channels = append(rep.Channels, + ChannelDiffRow{ChannelID: id, DetailSuccess: detailCh[id], DailySuccess: dailyCh[id]}) + rep.Summary.ChannelDiffs++ + } + } + + // ③ 上家:日汇总×当前归并/口径重推 ↔ 账单快照。 + dailyUp := map[int64]int64{} + var channels []entity.ChannelChannel + if err := s.db.WithContext(ctx).Find(&channels).Error; err != nil { + return nil, err + } + modeOf := map[int64]string{} + upstreamOf := map[int64]int64{} + for _, ch := range channels { + modeOf[ch.ID] = ch.BillingMode + upstreamOf[ch.ID] = ch.UpstreamID + } + for _, r := range statRows { + uid := upstreamOf[r.ChannelID] + if uid == 0 { + continue + } + dailyUp[uid] += int64(billableCount(modeOf[r.ChannelID], r)) + } + var upBills []entity.SettleUpstream + if err := s.db.WithContext(ctx). + Where("period = ?", period).Find(&upBills).Error; err != nil { + return nil, err + } + billUp := map[int64]entity.SettleUpstream{} + for _, b := range upBills { + billUp[b.UpstreamID] = b + } + upUnion := map[int64]struct{}{} + for id := range dailyUp { + upUnion[id] = struct{}{} + } + for id := range billUp { + upUnion[id] = struct{}{} + } + rep.Summary.UpstreamsChecked = len(upUnion) + for id := range upUnion { + bill, hasBill := billUp[id] + if hasBill && int64(bill.SuccessCount) != dailyUp[id] { + bs := int64(bill.SuccessCount) + rep.Upstreams = append(rep.Upstreams, + UpstreamDiffRow{UpstreamID: id, DailyCount: dailyUp[id], BillSuccess: &bs}) + rep.Summary.UpstreamDiffs++ + } else if !hasBill { + // 有日汇总无账单:与账号侧 BillMissing 同语义,列行不计数。 + rep.Upstreams = append(rep.Upstreams, + UpstreamDiffRow{UpstreamID: id, DailyCount: dailyUp[id]}) + } + } + + rep.Summary.AllZero = rep.Summary.AccountDiffs == 0 && + rep.Summary.ChannelDiffs == 0 && rep.Summary.UpstreamDiffs == 0 + return rep, nil +} diff --git a/internal/service/settle/reconcile_test.go b/internal/service/settle/reconcile_test.go new file mode 100644 index 00000000..7dbfcd60 --- /dev/null +++ b/internal/service/settle/reconcile_test.go @@ -0,0 +1,174 @@ +package settle + +// reconcile_test.go S2-D5:三方对账单测——全链一致性(明细→日汇总→账单) +// diff=0;篡改各事实源逐项暴露差异;缺账单=流程状态不判失败。 + +import ( + "context" + "testing" + "time" + + "gorm.io/gorm" + + "go-sms/internal/model/entity" +) + +// seedReconcile 全链种子:明细(11-10:acc1 ch1 2成功+1未知;acc2 ch2 1成功) +// → AggregateDay → 双向出账。ch1 绑上家 7 且 success_unknown 口径,ch2 绑 7 默认 success。 +func seedReconcile(t *testing.T, db *gorm.DB) { + t.Helper() + day, _ := time.ParseInLocation("2006-01-02 15:04", "2026-11-10 12:00", time.Local) + details := []entity.MessageDetail{ + {SnowflakeModel: entity.SnowflakeModel{ID: 9200000001, CreatedAt: day}, + TaskID: 900001, AccountID: 1, ChannelID: 1, Mobile: "13000000001", + Content: "t", Status: 2, Business: "sms", Fee: 1}, + {SnowflakeModel: entity.SnowflakeModel{ID: 9200000002, CreatedAt: day}, + TaskID: 900002, AccountID: 1, ChannelID: 1, Mobile: "13000000002", + Content: "t", Status: 2, Business: "sms", Fee: 1}, + {SnowflakeModel: entity.SnowflakeModel{ID: 9200000003, CreatedAt: day}, + TaskID: 900003, AccountID: 1, ChannelID: 1, Mobile: "13000000003", + Content: "t", Status: 4, Business: "sms", Fee: 1}, + {SnowflakeModel: entity.SnowflakeModel{ID: 9200000004, CreatedAt: day}, + TaskID: 900004, AccountID: 2, ChannelID: 2, Mobile: "13000000004", + Content: "t", Status: 2, Business: "sms", Fee: 1}, + } + if err := db.Create(&details).Error; err != nil { + t.Fatal(err) + } + if err := db.Create(&[]entity.ChannelChannel{ + {Model: entity.Model{ID: 1}, Name: "c1", Code: "rcc1", UpstreamID: 7, BillingMode: "success_unknown"}, + {Model: entity.Model{ID: 2}, Name: "c2", Code: "rcc2", UpstreamID: 7}, + }).Error; err != nil { + t.Fatal(err) + } + svc := NewService(db) + ctx := context.Background() + if _, _, err := svc.AggregateDay(ctx, day); err != nil { + t.Fatal(err) + } + if _, err := svc.GenerateCustomerBills(ctx, "2026-11"); err != nil { + t.Fatal(err) + } + if _, err := svc.GenerateUpstreamBills(ctx, "2026-11"); err != nil { + t.Fatal(err) + } +} + +// TestReconcile_AllZero 全链一致:三方零差异(S2 出口判据)。 +// 账号:acc1 明细2=汇总2=账单2;acc2 1=1=1。通道:ch1 2=2;ch2 1=1。 +// 上家 7:重推(2+1未知)+(1)=4=账单 4。 +func TestReconcile_AllZero(t *testing.T) { + db := newBillDB(t) + seedReconcile(t, db) + rep, err := NewService(db).ReconcilePeriod(context.Background(), "2026-11") + if err != nil { + t.Fatal(err) + } + s := rep.Summary + if !s.AllZero || s.AccountDiffs != 0 || s.ChannelDiffs != 0 || s.UpstreamDiffs != 0 { + t.Fatalf("应全零: %+v rows=%+v/%+v/%+v", s, rep.Accounts, rep.Channels, rep.Upstreams) + } + if s.AccountsChecked != 2 || s.BillMissing != 0 || s.ChannelsChecked != 2 || s.UpstreamsChecked != 1 { + t.Fatalf("checked 计数错: %+v", s) + } + var bill1, bill2 entity.SettleCustomer + var up7 entity.SettleUpstream + if err := db.Where("account_id = 1").First(&bill1).Error; err != nil { + t.Fatal(err) + } + if err := db.Where("account_id = 2").First(&bill2).Error; err != nil { + t.Fatal(err) + } + if err := db.Where("upstream_id = 7").First(&up7).Error; err != nil { + t.Fatal(err) + } + if bill1.SuccessCount != 2 || bill2.SuccessCount != 1 || up7.SuccessCount != 4 { + t.Fatalf("账单快照错: %+v/%+v/%+v", bill1, bill2, up7) + } +} + +// TestReconcile_ExposesDiffs 篡改三处事实源逐项暴露: +// ①consume acc1 success 2→5 → AccountDiffs=1(明细2/汇总5/账单2 同行列出); +// ②stats ch1 success 2→9 → ChannelDiffs=1(明细2/日汇总9)+ 上家重推(9+1)+1=11 +// vs 账单4 → UpstreamDiffs=1;③删 acc2 账单 → BillMissing=1 且 AllZero 仍真 +// (在①②还原后单独验证:此处先验证 missing 计数,AllZero 断言只看 diffs)。 +func TestReconcile_ExposesDiffs(t *testing.T) { + db := newBillDB(t) + seedReconcile(t, db) + svc := NewService(db) + ctx := context.Background() + + // ① 篡改消耗日汇总。 + if err := db.Model(&entity.BillingConsumeLog{}). + Where("account_id = 1").Update("success_count", 5).Error; err != nil { + t.Fatal(err) + } + // ② 篡改通道日汇总。 + if err := db.Model(&entity.StatsChannelDaily{}). + Where("channel_id = 1").Update("success_count", 9).Error; err != nil { + t.Fatal(err) + } + rep, err := svc.ReconcilePeriod(ctx, "2026-11") + if err != nil { + t.Fatal(err) + } + if rep.Summary.AccountDiffs != 1 || len(rep.Accounts) != 1 { + t.Fatalf("账号差异应 1 行: %+v rows=%+v", rep.Summary, rep.Accounts) + } + a := rep.Accounts[0] + if a.AccountID != 1 || a.DetailSuccess != 2 || a.ConsumeSuccess != 5 || + a.BillSuccess == nil || *a.BillSuccess != 2 { + t.Fatalf("账号差异行错: %+v", a) + } + if rep.Summary.ChannelDiffs != 1 || len(rep.Channels) != 1 || + rep.Channels[0].ChannelID != 1 || rep.Channels[0].DetailSuccess != 2 || rep.Channels[0].DailySuccess != 9 { + t.Fatalf("通道差异行错: %+v", rep.Channels) + } + if rep.Summary.UpstreamDiffs != 1 || len(rep.Upstreams) != 1 { + t.Fatalf("上家差异应 1 行: %+v", rep.Upstreams) + } + u := rep.Upstreams[0] + if u.UpstreamID != 7 || u.DailyCount != 11 || u.BillSuccess == nil || *u.BillSuccess != 4 { + t.Fatalf("上家差异行错(重推 9+1未知+1=11 vs 账单 4): %+v", u) + } + if rep.Summary.AllZero { + t.Fatal("存在差异时 AllZero 应为 false") + } + + // ③ 还原①②后删下家账单:BillMissing=1,但 diffs 全零 → AllZero 仍真。 + if err := db.Model(&entity.BillingConsumeLog{}). + Where("account_id = 1").Update("success_count", 2).Error; err != nil { + t.Fatal(err) + } + if err := db.Model(&entity.StatsChannelDaily{}). + Where("channel_id = 1").Update("success_count", 2).Error; err != nil { + t.Fatal(err) + } + if err := db.Where("account_id = 2").Delete(&entity.SettleCustomer{}).Error; err != nil { + t.Fatal(err) + } + rep, err = svc.ReconcilePeriod(ctx, "2026-11") + if err != nil { + t.Fatal(err) + } + if rep.Summary.BillMissing != 1 || rep.Summary.AccountDiffs != 0 { + t.Fatalf("缺账单应 BillMissing=1 且 diffs=0: %+v", rep.Summary) + } + if !rep.Summary.AllZero { + t.Fatalf("缺账单=流程状态,不应判失败: %+v", rep.Summary) + } + var missing int + for _, r := range rep.Accounts { + if r.AccountID == 2 && r.BillSuccess == nil { + missing++ + } + } + if missing != 1 { + t.Fatalf("acc2 应以 bill_success=nil 列出: %+v", rep.Accounts) + } + + // ④ 非法 period → ISC:400。 + if _, err := svc.ReconcilePeriod(ctx, "2026-1"); err == nil { + t.Fatal("非法 period 应报错") + } +} diff --git a/memory-bank/activeContext.md b/memory-bank/activeContext.md index 6adb6f6e..6eccf45c 100644 --- a/memory-bank/activeContext.md +++ b/memory-bank/activeContext.md @@ -1,15 +1,16 @@ # 当前工作上下文(最近更新:2026-11-14) -## 当前状态快照(2026-11-14 深夜,**S2-D4 收官,进度 4/5**) +## 当前状态快照(2026-11-14 深夜③,**S2 泳道收官,进度 5/5**) - **仓库**:main 已推 Gitea;每日 bundle+push 双轨。 -- **S2 进度 4/5**:D1 表设计+v20+契约 / D2 消耗日汇总(滚动重刷)/ D3 充值审核流 / **D4 ✅ 出账引擎+阶梯**——price.go(R1/R6 唯一换算:业务线×时间线回溯+阶梯月量落档)+bill.go(下家/上家生成-确认-结账+SettleRecord+ladder CRUD)+export.go XLSX 双导出+15 端点;**阶梯结算单测全绿(S2 显式验收项)**+上家 billing_mode 三口径+状态机终态幂等;真机出账全链(时间线 10→阶梯覆写 5→结账快照→真 XLSX 5637B)。D4-0 六口径(Q1~Q6)经方案批准生效。 -- **⚠️ 流程补正在途**:七件套「本人走查」项——**结算验收页已上线**(浏览器 :5173 登录 s2demo/S2demo@2026 → 统计结算/结算管理,Playwright 预走查真库闭环已过:余额+1000/账单 1955.00 分毫不差),**待用户页面走查后回填**;curl 脚本 `docs/acceptance/scripts/s2-walkthrough.sh` 保留作回归。**casbin 留痕:SQL 直插 g 规则需重启 gateway 生效**。 +- **S2 全五日 ✅ 收官**:D1 表设计+v20+契约 / D2 消耗日汇总(滚动重刷)/ D3 充值审核流 / D4 出账引擎+阶梯 / **D5 ✅ 利润/返点/三方对账**——profit.go(用户利润:时间线价收入+成本占比分摊+直线下级返点 R4 历史不重算+子树 Path 过滤;通道利润同分母分摊守恒)+reconcile.go(三方=明细直查 vs 日汇总 vs 结算单,金额不比=快照语义,bill_missing 不判失败)+cmd/reconcile/settle-check(exit 0=all_zero)+/stats/profit 双端点(平台角色门)。**真机全链 all_zero=true EXIT=0(S2 出口判据达成)**;出口两项(结算单测+对账差异 0)全过,六项裁决 R1~R6 全闭环,判定单 s2-closeout.md。 +- **⚠️ 流程补正在途**:七件套「本人走查」项——**走查脚本已扩 D2~D5 全域**(浏览器结算页 :5173 s2demo + curl 脚本 `docs/acceptance/scripts/s2-walkthrough.sh` AI 预走查 **27 PASS/0 FAIL**),**待用户执行后回填** s2-d4/d5/closeout。**casbin 留痕:SQL 直插 g 规则需重启 gateway 生效**。 - **24h 稳定性门槛 ✅ 终判通过**(S1 完全闭环,S5 压测前置确认)。 -- **六项裁决速查**:R1/R6 换算只在 price.go(已落地)/R2 事实源 D2 落账/R3 双通道 D3 落地(ref_id 区分)/R4 rebate_rate(D5 消费)/R5 settle_ladder(D4 落地)。 -- **下一步=S2-D5 利润/返点/三方对账(S2 收官)**:profit.go(用户利润含下级树 Path 聚合+通道利润+rebate 计算,R4 历史不重算)+reconcile.go(三方=明细直查 vs 日汇总 vs 结算单,diff=0=S2 出口)+cmd/reconcile settle-check 子命令+/stats/profit 双端点;收官=S2 全域用户走查(脚本+D4 出账链)+s2-closeout.md。 +- **六项裁决速查(全闭环)**:R1/R6 换算只在 price.go / R2 事实源 D2 落账 / R3 双通道 D3 落地(ref_id 区分)/ **R4 rebate_rate D5 落地(profit.go 现算不落档)** / R5 settle_ladder D4 落地。 +- **下一步=S3 前端泳道**(views 31 页搬运+FE-6 权限矩阵走查+Mock 下线;利润分析页 FE-D34 消费 /stats/profit);用户走查回填为在途补正不阻塞开工。 - 归档仓(只读):/data/poc-archive/repos/go-sms.git。 -- **本会话运维教训**:①`pkill/pgrep -f` 自匹配(铁律:`[x]` 括号技巧);②大镜像单窗>体积÷带宽;③du 无 sudo 静默失败误诊;④sed 换行/sed 误伤方法名(重构期优先编辑器工具);⑤Go 工具忽略 `_` 前缀文件;⑥集成测试需 `sg docker` 包裹(docker 组未重登);⑦**Makefile recipe 的 `exit 0` 只退出当前行 shell 不终止目标**(幂等短路须 if/else 递归 `$(MAKE)` 子目标);⑧**管道 `| tail -N` 截首行误导诊断**(gw-start"玄学 NOMATCH"两轮误诊实为 THEN 分支已生效,排查须看全量输出)。 +- **本会话教训**:①明细雪花 ID 直插 SQL 须 < int64 上限 9.22e18(9302… 段拒收,走查种子统一 7302… 段);②`sg docker -c '…$VAR…'` 单引号内变量不展开(内层空展开致 SQL 语法错)——多语句 SQL 用 `printf|docker exec -i` 外层展开;③网关重启须含最新端点二进制(串行 build→kill→md5)。 +- **历史运维教训**:①`pkill/pgrep -f` 自匹配(铁律:`[x]` 括号技巧);②大镜像单窗>体积÷带宽;③du 无 sudo 静默失败误诊;④sed 换行/sed 误伤方法名(重构期优先编辑器工具);⑤Go 工具忽略 `_` 前缀文件;⑥集成测试需 `sg docker` 包裹(docker 组未重登);⑦**Makefile recipe 的 `exit 0` 只退出当前行 shell 不终止目标**(幂等短路须 if/else 递归 `$(MAKE)` 子目标);⑧**管道 `| tail -N` 截首行误导诊断**(gw-start"玄学 NOMATCH"两轮误诊实为 THEN 分支已生效,排查须看全量输出)。 ## 重建启动(2026-11-12 裁决 / 盘点 / 迁移方案) diff --git a/memory-bank/progress.md b/memory-bank/progress.md index da7c5369..5fb2b4fc 100644 --- a/memory-bank/progress.md +++ b/memory-bank/progress.md @@ -16,7 +16,8 @@ | S2-D3 充值审核流 | recharge.go(创建/confirm 单事务 CAS+余额自增+流水 ref_id=order_no/驳回/列表)+ISC:039 三处同步+四端点(二级权限+平台角色门);测试 7 件含并发 confirm;真机全链冒烟+审计留痕实证 | ✅ 2026-11-14 夜(验收单 s2-d3.md) | | S2-D4 出账+阶梯 | price.go(R1/R6 唯一换算)+bill.go(生成/确认/结账/SettleRecord/ladder)+export.go XLSX+15 端点;**阶梯结算单测(S2 显式验收项)**+上家三口径+状态机;真机出账全链(阶梯覆写/结账/真 XLSX) | ✅ 2026-11-14 深夜(验收单 s2-d4.md;用户走查在途补正) | | S2 前端验收面 | 结算管理页四 Tab+api 12 端点+seed 演示(s2demo)+Playwright 预走查真库闭环(余额+1000/账单 1955.00);前端四件全绿 | ✅ 2026-11-14 深夜②(用户页面走查在途;s2-frontend-preview.md) | -| S2-D5 | 利润/返点+三方对账(diff=0=S2 出口)+S2 收官走查 | ⬜ 排期中 | +| S2-D5 利润/返点/对账 | profit.go(时间线价收入+成本分摊+R4 返点现算+子树过滤;通道利润守恒分摊)+reconcile.go(三方对账,金额不比,missing 不判失败)+settle-check 子命令+/stats/profit 双端点;**真机 all_zero=true EXIT=0=S2 出口判据**;走查脚本扩 D2~D5 全域 27 PASS | ✅ 2026-11-14 深夜③(用户走查在途;s2-d5.md) | +| S2 泳道收官 | 出口两项(结算单测+对账差异 0)全过;六项裁决 R1~R6 全闭环 | ✅ 2026-11-14 深夜③(判定单 s2-closeout.md;用户走查在途补正) | | 观察项 | 24h 稳定性门槛(11-13 17:55 起计;期内 21:33 宿主主动重启=已知事件不判失败)期满核验 11-14 17:55 | ✅ 2026-11-14 18:02 终判通过(dmesg 0/零重启/驻留+md5 一致;S5 压测前置确认,S1 完全闭环) | | S2~S5 | 结算域/前端收尾/C1C2+冷热/基线与灰度 | ⬜ 见《Go-sms-重建计划.md》 |