S2-D5 利润/返点/三方对账——S2 泳道收官: profit.go(UserProfit 时间线价收入+成本占比分摊+直线下级返点 R4 历史不重算=不落档现算+parent_id 子树 Path 过滤+平台净利双口径;ChannelProfit 同分母分摊 Σ守恒;阶梯不进分析=与账单金额差为口径差异)+reconcile.go(三方对账:账号=明细直查↔billing_consume_log↔settle_customer 条数/通道两方/上家=当前归并口径重推↔快照;金额不比=快照语义防调价噪音;bill_missing 不判失败;AllZero=出口判据)+cmd/reconcile/settle-check(-period/-json,exit 0=all_zero)+handler /stats/profit/users·channels 双端点(平台角色门,缺省窗本月至今)+openapi 描述对齐;测试 5 件(利润树/返点/分摊/子树/守恒+对账全零+篡改逐项暴露+missing 语义+handler 数值/403/坏日期);真机全链:2026-10 空月种链→汇总 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 全域 AI 预走查 27 PASS/0 FAIL+修复两存量 bug(明细 ID 9302 段超 int64 拒收→7302 段/清理段 $ON $B0 单引号不展开致 SQL 语法错→printf|mysql_pipe);门禁 vet/-race 39 包/lint 0;收官判定 s2-closeout.md(出口两项全过+六项裁决 R1~R6 全闭环)+验收单 s2-d5.md+CHANGELOG+memory-bank 回填
This commit is contained in:
@@ -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 开工判定(在途补正机制)。
|
||||
@@ -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`。
|
||||
@@ -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] 请连同整份日志交回 ====="
|
||||
|
||||
Reference in New Issue
Block a user