S2-D4 出账引擎+阶梯(S2 显式验收项落地): price.go(R1/R6 唯一换算点:PriceAtAccount 业务线×时间线回溯/PriceAtChannel/LadderPrice 月量落档;D4-0 六口径 Q1~Q6 经方案批准生效)+bill.go(下家/上家生成 uk UPSERT 幂等重算-已结 skipped/确认 0→1/结账 1→2 CAS+SettleRecord 金额快照同事务/按天明细/ladder CRUD)+export.go excelize 双导出+handler 15 端点(settle:write 门/customer 账单仅自己);测试 6 件含阶梯结算单测(首档覆写/恰好落档边界/删档回退)+上家 billing_mode 三口径+状态机终态幂等+handler 全流程;真机出账全链:生成 10→配阶梯重算 5→结账 SettleRecord→skipped→5637B 真 XLSX,数据还原;修复留痕 Pluck 链式列污染/isDuplicateKey 大小写/idx_period 方言坑第三例;门禁 vet/-race 39 包/lint 0;用户走查脚本 s2-walkthrough.sh 备档(本人走查项补正在途);验收单 s2-d4.md+CHANGELOG+memory-bank 回填
This commit is contained in:
@@ -0,0 +1,43 @@
|
||||
# S2-D4 出账引擎+阶梯 人工验收单(2026-11-14 夜)
|
||||
|
||||
> 前置:s2-d3.md(充值审核流)。本单覆盖 D4:月结出账全链——计价引擎/阶梯/确认/结账/XLSX 导出。
|
||||
> **D4-0 口径**:Q1~Q6 六项业务口径以方案默认值经用户批准方案后生效(Q1 无价日 0 元入账/Q2 阶梯整月覆写/
|
||||
> Q3 上家 all=submit/Q4 按生成时点当前 upstream_id 归并/Q5 全业务合并/Q6 状态机 0→1→2)——
|
||||
> **用户走查补正项见文末**(S2 收官一并人工核)。
|
||||
|
||||
## 一、交付物
|
||||
|
||||
| # | 任务 | 结果 | 证据 |
|
||||
|---|---|---|---|
|
||||
| 1 | **settle/price.go** | ✅ | R1/R6 全链唯一换算点:PriceAtAccount(业务线×时间线回溯 EffectiveAt≤当日)/PriceAtChannel/LadderPrice(月量落档取最高 tier_from) |
|
||||
| 2 | **settle/bill.go** | ✅ | GenerateCustomerBills(逐业务逐日计价,阶梯覆写,uk UPSERT 幂等,已结 skipped)/GenerateUpstreamBills(通道→upstream 当前归并,billing_mode 三口径)/Confirm(0→1)/Settle(1→2 CAS+SettleRecord 金额快照同事务)/列表/按天明细/ladder CRUD(同 owner 同 tier_from 唯一) |
|
||||
| 3 | **settle/export.go** | ✅ | excelize:下家=单头+按天明细;上家=单头+通道×天明细(含单价列) |
|
||||
| 4 | **handler 15 端点** | ✅ | customer 6/generate/upstream 5/ladder 4;settle:write 门;customer 账单仅自己(handler scope);上家域平台角色门 |
|
||||
| 5 | **测试 6 件**(settle 包 5+handler 1) | ✅ | **阶梯结算单测(S2 显式验收项)**:首档覆写 7.5/恰好落档 1000→40.0/删阶梯回退时间线;时间线月中调价按日分档(10.0+10.0);上家三口径(4.4/4.5)+未绑通道不入账;状态机 0→1→2+SettleRecord 快照+终态幂等;ladder CRUD+重复档 400;handler 全流程(生成→配档重算 5→确认→结账→skipped→导出 PK→403 门) |
|
||||
|
||||
## 二、门禁(七件套后端件)
|
||||
|
||||
| 项 | 结果 |
|
||||
|---|---|
|
||||
| go vet ./... | ✅ RC=0 |
|
||||
| go test -race ./...(全量) | ✅ **39 包 ok 零 FAIL**(settle 包 14 件) |
|
||||
| golangci-lint v2.1.6 | ✅ 0 issues |
|
||||
|
||||
## 三、真机验证(dev,2026-11-14 21:34,HS256 临时 token)
|
||||
|
||||
**出账全链**:种价(0.10)+消耗(succ=100)→生成 `{generated:1}`(时间线金额 10)→配阶梯(0 档 0.05)→重算 `{recalculated:1}`(**覆写 5**=100×0.05)→列表 amount=5 ✓→确认→结账(**SettleRecord:direction=1/amount=5/operator=admin/settled_at**)→再生成 `{skipped:1}`(已结拒重算)→**导出 5637 字节真 XLSX**(`file` 识别 Microsoft Excel 2007+)。数据已清理还原。
|
||||
|
||||
## 四、口径留痕(修复过程)
|
||||
|
||||
- settleBill 金额快照:Pluck 链式复用导致列类型污染(sqlite 实测暴露)→ 改 Select+Scan 单查询;
|
||||
- isDuplicateKey 补大小写归一(sqlite 2067 码 "UNIQUE constraint" 小写实测暴露);
|
||||
- 手动建表方言坑第三例:settle_upstream 的 idx_period 与 settle_customer 同名(测试侧无索引+显式 UNIQUE 约束版本)。
|
||||
|
||||
## 五、用户走查(补正项,七件套·本人走查)
|
||||
|
||||
- 走查脚本已备:`docs/acceptance/scripts/s2-walkthrough.sh`(覆盖 D2/D3;D4 出账链建议随 S2 收官走查一并执行——生成/阶梯/结账/导出 curl 序列与 §三一致)。
|
||||
- **结果:待用户执行后回填**(此前 D2/D3 验收为自动化测试+AI 冒烟,本人走查项以此补正)。
|
||||
|
||||
## 六、验收结论
|
||||
|
||||
**S2-D4 通过(自动化门禁与真机冒烟);用户走查项在途待回填。** D5(利润/返点/三方对账)为 S2 收官任务。
|
||||
Executable
+123
@@ -0,0 +1,123 @@
|
||||
#!/usr/bin/env bash
|
||||
# s2-walkthrough.sh S2-D2/D3 用户人工走查脚本(2026-11-14)
|
||||
#
|
||||
# 用途:把 S2-D2(消耗日汇总)/S2-D3(充值审核流)的验收从「AI 自证」补正为
|
||||
# 「用户本人走查」(七件套·本人走查项)。全程只读或可还原,跑完自动清理。
|
||||
# 前置:① gateway 在跑(:8080,make gw-start) ② sg docker 可用(dev MySQL 13306)
|
||||
# 用法:bash docs/acceptance/scripts/s2-walkthrough.sh 2>&1 | tee /tmp/s2-walk.log
|
||||
# 走查后将 /tmp/s2-walk.log 全文交回,回填 s2-d2.md/s2-d3.md 走查记录。
|
||||
set -u
|
||||
GW=http://127.0.0.1:8080/api/v1
|
||||
step() { echo; echo "===== $1 ====="; }
|
||||
pass() { echo "[PASS] $1"; }
|
||||
fail() { echo "[FAIL] $1 (预期 ${2:-?},见上行输出)"; }
|
||||
|
||||
# ---------- 步骤 0:签临时 JWT(dev secret,账号 1=admin) ----------
|
||||
step "步骤0 签发临时 token(非侵入)"
|
||||
TOK=$(python3 - <<'EOF'
|
||||
import hmac, hashlib, base64, json, time, uuid
|
||||
def b64(d): return base64.urlsafe_b64encode(d).rstrip(b'=')
|
||||
now = int(time.time())
|
||||
h = b64(json.dumps({'alg':'HS256','typ':'JWT'}).encode())
|
||||
p = b64(json.dumps({'account_id':1,'username':'admin','roles':['admin'],
|
||||
'permissions':[],'jti':uuid.uuid4().hex,'iss':'go-sms','sub':'1',
|
||||
'exp':now+3600,'iat':now}).encode())
|
||||
s = b64(hmac.new(b'dev-go-sms-secret', h+b'.'+p, hashlib.sha256).digest())
|
||||
print((h+b'.'+p+b'.'+s).decode())
|
||||
EOF
|
||||
)
|
||||
AUTH="Authorization: Bearer $TOK"
|
||||
curl -s -m 3 -H "$AUTH" "$GW/billing/consume" | grep -q ISC:000 \
|
||||
&& pass "token 有效(列表 200)" || fail "token 无效"
|
||||
|
||||
# ---------- D2 走查:消耗日汇总 ----------
|
||||
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 \
|
||||
&& pass "明细 2 条已插入" || fail "明细插入"
|
||||
|
||||
step "D2-2 手动触发今日汇总(应 account_rows=1/channel_rows=1)"
|
||||
R=$(curl -s -m 5 -X POST -H "$AUTH" -H 'Content-Type: application/json' \
|
||||
-d "{\"date\":\"$(date +%F)\"}" "$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 "D2-3 查询消耗(admin 应见账号1:submit2/succ1/unk1/fee4.0)"
|
||||
R=$(curl -s -m 5 -H "$AUTH" "$GW/billing/consume?account_id=1")
|
||||
echo "$R"
|
||||
echo "$R" | grep -q '"success_count":1' && echo "$R" | grep -q '"unknown_count":1' \
|
||||
&& echo "$R" | grep -q '"fee_total":4' && pass "计数口径正确" || fail "计数口径"
|
||||
|
||||
step "D2-4 customer 视角收窄(以账号1 冒充 customer 应仍只见自己)"
|
||||
TOKC=$(python3 - <<'EOF'
|
||||
import hmac, hashlib, base64, json, time, uuid
|
||||
def b64(d): return base64.urlsafe_b64encode(d).rstrip(b'=')
|
||||
now = int(time.time())
|
||||
h = b64(json.dumps({'alg':'HS256','typ':'JWT'}).encode())
|
||||
p = b64(json.dumps({'account_id':1,'username':'admin','roles':['customer'],
|
||||
'permissions':[],'jti':uuid.uuid4().hex,'iss':'go-sms','sub':'1',
|
||||
'exp':now+3600,'iat':now}).encode())
|
||||
s = b64(hmac.new(b'dev-go-sms-secret', h+b'.'+p, hashlib.sha256).digest())
|
||||
print((h+b'.'+p+b'.'+s).decode())
|
||||
EOF
|
||||
)
|
||||
R=$(curl -s -m 5 -H "Authorization: Bearer $TOKC" "$GW/billing/consume?account_id=999")
|
||||
echo "$R"
|
||||
echo "$R" | grep -q '"total":1' && pass "customer 越权带参被覆盖收窄(total=1)" || fail "customer 收窄"
|
||||
|
||||
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
|
||||
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")
|
||||
echo "$R"
|
||||
echo "$R" | grep -q '"success_count":2' && echo "$R" | grep -q '"unknown_count":0' \
|
||||
&& pass "滚动重刷收敛(72h 回执窗语义)" || fail "收敛"
|
||||
|
||||
# ---------- D3 走查:充值订单 ----------
|
||||
step "D3-1 创建订单(count=300,不动余额)"
|
||||
B0=$(sg docker -c 'docker exec go-sms-mysql mysql -uroot -proot123 gosms -N -e "SELECT balance FROM account_user WHERE id=1;"' 2>/dev/null)
|
||||
R=$(curl -s -m 5 -H "$AUTH" -H 'Content-Type: application/json' \
|
||||
-d '{"account_id":1,"count":300,"amount":30.0,"pay_type":"bank","remark":"s2-walk"}' "$GW/billing/orders")
|
||||
echo "$R"
|
||||
ON=$(echo "$R" | grep -o '"order_no":"[^"]*"' | cut -d'"' -f4)
|
||||
OID=$(echo "$R" | grep -o '"id":[0-9]*' | head -1 | cut -d: -f2)
|
||||
B1=$(sg docker -c 'docker exec go-sms-mysql mysql -uroot -proot123 gosms -N -e "SELECT balance FROM account_user WHERE id=1;"' 2>/dev/null)
|
||||
[ "$B0" = "$B1" ] && echo "$R" | grep -q '"pay_status":0' \
|
||||
&& pass "创建后 pay_status=0 且余额未动($B0)" || fail "创建不动余额"
|
||||
|
||||
step "D3-2 confirm(余额应 +300)"
|
||||
R=$(curl -s -m 5 -X POST -H "$AUTH" "$GW/billing/orders/$OID/confirm")
|
||||
echo "$R"
|
||||
echo "$R" | grep -q "\"balance\":$((B0+300))" && pass "confirm 余额 $B0→$((B0+300))" || fail "confirm 余额"
|
||||
|
||||
step "D3-3 重复 confirm(应 409 ISC:039)"
|
||||
R=$(curl -s -w '\nHTTP=%{http_code}' -m 5 -X POST -H "$AUTH" "$GW/billing/orders/$OID/confirm")
|
||||
echo "$R"
|
||||
echo "$R" | grep -q 'HTTP=409' && echo "$R" | grep -q 'ISC:039' && pass "409+ISC:039" || fail "重复 confirm"
|
||||
|
||||
step "D3-4 真库核验流水(ref_id=order_no 双通道锚点)"
|
||||
sg docker -c "docker exec go-sms-mysql mysql -uroot -proot123 gosms -e \
|
||||
\"SELECT biz_type,amount,balance_after,ref_id FROM account_balance_log WHERE ref_id='$ON';\"" 2>/dev/null
|
||||
|
||||
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
|
||||
|
||||
# ---------- 清理还原 ----------
|
||||
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 \
|
||||
&& pass "数据已还原" || fail "清理"
|
||||
|
||||
echo
|
||||
echo "===== 走查完成:以上 [PASS] 全绿即 S2-D2/D3 用户走查通过;任一 [FAIL] 请连同整份日志交回 ====="
|
||||
Reference in New Issue
Block a user