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 回填
ci / test (push) Canceled after 0s
ci / build (push) Canceled after 0s
ci / deploy-dev (push) Canceled after 0s

This commit is contained in:
2026-11-14 21:36:02 +08:00
parent d046299a66
commit a8530ce6b2
12 changed files with 1541 additions and 11 deletions
+8
View File
@@ -2,6 +2,14 @@
> 本仓 CHANGELOG 自重建起记(POC 明细见归档仓 /data/poc-archive/repos/go-sms.git 的 CHANGELOG.md,已冻结)。 > 本仓 CHANGELOG 自重建起记(POC 明细见归档仓 /data/poc-archive/repos/go-sms.git 的 CHANGELOG.md,已冻结)。
## 2026-11-14(深夜)· S2-D4 出账引擎+阶梯(S2 显式验收项落地)
- **settle/price.go(R1/R6 唯一换算点)**:PriceAtAccount(业务线×时间线回溯)/PriceAtChannel/LadderPrice(月量落档)。D4-0 六口径(Q1 无价 0 元入账/Q2 阶梯整月覆写/Q3 all=submit/Q4 当前 upstream 归并/Q5 全业务合并/Q6 状态机)经方案批准生效。
- **settle/bill.go**:下家/上家生成(uk UPSERT 幂等重算,已结 skipped)+确认(0→1)+结账(1→2 CAS+SettleRecord 金额快照同事务)+按天明细+ladder CRUD;**settle/export.go** excelize 双导出(下家按天/上家通道×天)。
- **handler 15 端点**(settle:write 门;customer 账单仅自己;上家平台角色)。
- **测试 6 件**:**阶梯结算单测(S2 显式验收项)**——首档覆写/恰好落档边界/删档回退时间线;月中调价按日分档;上家三口径+未绑通道不入账;状态机+SettleRecord+终态幂等;handler 全流程(生成→配档重算→确认→结账→skipped→导出 PK→403)。
- **真机出账全链**:生成 10→配阶梯重算 5→结账 SettleRecord(direction/amount 快照)→已结 skipped→**5637 字节真 XLSX**;数据还原。门禁 vet/**-race 39 包**/lint 0。修复留痕:Pluck 链式列污染→Select+Scan;isDuplicateKey 大小写归一;idx_period 同名方言坑第三例。验收单 `docs/acceptance/s2-d4.md`;**用户走查脚本** `docs/acceptance/scripts/s2-walkthrough.sh`(D2/D3 覆盖,本人走查项补正在途)。
## 2026-11-14(夜)· S2-D3 充值审核流(R3 双通道落地) ## 2026-11-14(夜)· S2-D3 充值审核流(R3 双通道落地)
- **settle/recharge.go**:CreateOrder(pay_status=0 不动余额;OrderNo=B+时间戳+4 随机,uk 重试)/ConfirmOrder(**单事务=状态 CAS(WHERE pay_status=0→ISC:039)→余额原子自增 count→同事务回读→流水 ref_id=order_no**——双通道天然区分:即时充值流水 ref_id 空)/RejectOrder(0→2 不涉余额)/ListOrders。 - **settle/recharge.go**:CreateOrder(pay_status=0 不动余额;OrderNo=B+时间戳+4 随机,uk 重试)/ConfirmOrder(**单事务=状态 CAS(WHERE pay_status=0→ISC:039)→余额原子自增 count→同事务回读→流水 ref_id=order_no**——双通道天然区分:即时充值流水 ref_id 空)/RejectOrder(0→2 不涉余额)/ListOrders。
+43
View File
@@ -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 收官任务。
+123
View File
@@ -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] 请连同整份日志交回 ====="
+286
View File
@@ -13,6 +13,7 @@ import (
"go-sms/internal/config" "go-sms/internal/config"
"go-sms/internal/middleware" "go-sms/internal/middleware"
"go-sms/internal/model/entity"
errs "go-sms/internal/pkg/errors" errs "go-sms/internal/pkg/errors"
"go-sms/internal/pkg/response" "go-sms/internal/pkg/response"
"go-sms/internal/service/settle" "go-sms/internal/service/settle"
@@ -40,6 +41,30 @@ func registerSettleRoutes(protected *gin.RouterGroup, deps Deps) {
middleware.RequirePermission(deps.Perm, "account", middleware.PermRecharge), h.orderConfirm) middleware.RequirePermission(deps.Perm, "account", middleware.PermRecharge), h.orderConfirm)
protected.POST("/billing/orders/:id/reject", protected.POST("/billing/orders/:id/reject",
middleware.RequirePermission(deps.Perm, "account", middleware.PermRecharge), h.orderReject) middleware.RequirePermission(deps.Perm, "account", middleware.PermRecharge), h.orderReject)
// S2-D4:出账+阶梯(settle:write 门=D1 契约;查询类平台角色/客户仅自己)。
protected.GET("/settle/customer", h.customerBills)
protected.POST("/settle/customer/generate",
middleware.RequirePermission(deps.Perm, "settle", "write"), h.customerGenerate)
protected.GET("/settle/customer/:id", h.customerBillDetail)
protected.POST("/settle/customer/:id/confirm",
middleware.RequirePermission(deps.Perm, "settle", "write"), h.customerBillConfirm)
protected.POST("/settle/customer/:id/settle",
middleware.RequirePermission(deps.Perm, "settle", "write"), h.customerBillSettle)
protected.GET("/settle/customer/:id/export", h.customerBillExport)
protected.GET("/settle/upstream", h.upstreamBills)
protected.POST("/settle/upstream/generate",
middleware.RequirePermission(deps.Perm, "settle", "write"), h.upstreamGenerate)
protected.GET("/settle/upstream/:id", h.upstreamBillDetail)
protected.POST("/settle/upstream/:id/settle",
middleware.RequirePermission(deps.Perm, "settle", "write"), h.upstreamBillSettle)
protected.GET("/settle/upstream/:id/export", h.upstreamBillExport)
protected.GET("/settle/ladder", h.ladderList)
protected.POST("/settle/ladder",
middleware.RequirePermission(deps.Perm, "settle", "write"), h.ladderCreate)
protected.PUT("/settle/ladder/:id",
middleware.RequirePermission(deps.Perm, "settle", "write"), h.ladderUpdate)
protected.DELETE("/settle/ladder/:id",
middleware.RequirePermission(deps.Perm, "settle", "write"), h.ladderDelete)
} }
// StartSettleAggregateJob v1 层装配入口(照 StartStatsRefresher 模式,仅 // StartSettleAggregateJob v1 层装配入口(照 StartStatsRefresher 模式,仅
@@ -231,3 +256,264 @@ func (h *settleHandler) orderReject(c *gin.Context) {
} }
response.Success(c, order) response.Success(c, order)
} }
// ---- S2-D4:出账 handler ----
// billQueryFrom 通用账单列表参数解析。
func billQueryFrom(c *gin.Context) (settle.BillQuery, error) {
q := settle.BillQuery{Period: c.Query("period"), Page: 1, PageSize: 20}
if v, err := strconv.ParseInt(c.Query("account_id"), 10, 64); err == nil && v > 0 {
q.OwnerID = v
}
if v, err := strconv.ParseInt(c.Query("upstream_id"), 10, 64); err == nil && v > 0 {
q.OwnerID = v
}
if s := c.Query("status"); s != "" {
v, err := strconv.Atoi(s)
if err != nil || v < 0 || v > 2 {
return q, errs.InvalidParam.WithMsg("status 须为 0/1/2")
}
st := int8(v)
q.Status = &st
}
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
}
return q, nil
}
// customerBills GET /settle/customer:customer 仅自己;平台角色全量。
func (h *settleHandler) customerBills(c *gin.Context) {
q, err := billQueryFrom(c)
if err != nil {
response.Error(c, err.(*errs.Error))
return
}
if claims := statsClaims(c); claims != nil && !statsIsPlatform(c) {
q.OwnerID = claims.AccountID
}
list, total, err := h.svc.ListCustomerBills(c.Request.Context(), q)
if err != nil {
bizResp(c, err)
return
}
response.Success(c, gin.H{"total": total, "list": list})
}
// customerGenerate POST /settle/customer/generate {period}。
func (h *settleHandler) customerGenerate(c *gin.Context) {
var req struct {
Period string `json:"period" binding:"required"`
}
if err := c.ShouldBindJSON(&req); err != nil {
response.Error(c, errs.InvalidParam.WithMsg("period 必填(YYYY-MM)"))
return
}
res, err := h.svc.GenerateCustomerBills(c.Request.Context(), req.Period)
if err != nil {
bizResp(c, err)
return
}
response.Success(c, res)
}
// customerBillDetail GET /settle/customer/:id:单头+按天明细;customer 仅自己。
func (h *settleHandler) customerBillDetail(c *gin.Context) {
id, _ := strconv.ParseInt(c.Param("id"), 10, 64)
bill, err := h.svc.GetCustomerBill(c.Request.Context(), id)
if err != nil {
bizResp(c, err)
return
}
if claims := statsClaims(c); claims != nil && !statsIsPlatform(c) && bill.AccountID != claims.AccountID {
response.Error(c, errs.Forbidden.WithMsg("非本人账单"))
return
}
days, err := h.svc.CustomerBillDays(c.Request.Context(), bill)
if err != nil {
bizResp(c, err)
return
}
response.Success(c, gin.H{"bill": bill, "days": days})
}
// customerBillConfirm POST /settle/customer/:id/confirm 0→1。
func (h *settleHandler) customerBillConfirm(c *gin.Context) {
id, _ := strconv.ParseInt(c.Param("id"), 10, 64)
if err := h.svc.ConfirmCustomerBill(c.Request.Context(), id); err != nil {
bizResp(c, err)
return
}
response.Success(c, nil)
}
// customerBillSettle POST /settle/customer/:id/settle 1→2+settle_record。
func (h *settleHandler) customerBillSettle(c *gin.Context) {
id, _ := strconv.ParseInt(c.Param("id"), 10, 64)
var req struct {
PayType string `json:"pay_type"`
Remark string `json:"remark"`
}
_ = c.ShouldBindJSON(&req)
operator := ""
if claims := statsClaims(c); claims != nil {
operator = claims.Username
}
rec, err := h.svc.SettleCustomerBill(c.Request.Context(), id, req.PayType, operator, req.Remark)
if err != nil {
bizResp(c, err)
return
}
response.Success(c, rec)
}
// customerBillExport GET /settle/customer/:id/export XLSX。
func (h *settleHandler) customerBillExport(c *gin.Context) {
id, _ := strconv.ParseInt(c.Param("id"), 10, 64)
data, name, err := h.svc.ExportCustomerBillXLSX(c.Request.Context(), id)
if err != nil {
bizResp(c, err)
return
}
c.Header("Content-Disposition", `attachment; filename="`+name+`"`)
c.Data(200, "application/octet-stream", data)
}
// upstreamBills GET /settle/upstream(平台角色)。
func (h *settleHandler) upstreamBills(c *gin.Context) {
if !statsIsPlatform(c) {
response.Error(c, errs.Forbidden.WithMsg("仅平台角色可查看上家账单"))
return
}
q, err := billQueryFrom(c)
if err != nil {
response.Error(c, err.(*errs.Error))
return
}
list, total, err := h.svc.ListUpstreamBills(c.Request.Context(), q)
if err != nil {
bizResp(c, err)
return
}
response.Success(c, gin.H{"total": total, "list": list})
}
// upstreamGenerate POST /settle/upstream/generate {period}。
func (h *settleHandler) upstreamGenerate(c *gin.Context) {
var req struct {
Period string `json:"period" binding:"required"`
}
if err := c.ShouldBindJSON(&req); err != nil {
response.Error(c, errs.InvalidParam.WithMsg("period 必填(YYYY-MM)"))
return
}
res, err := h.svc.GenerateUpstreamBills(c.Request.Context(), req.Period)
if err != nil {
bizResp(c, err)
return
}
response.Success(c, res)
}
// upstreamBillDetail GET /settle/upstream/:id:单头+通道×天明细。
func (h *settleHandler) upstreamBillDetail(c *gin.Context) {
id, _ := strconv.ParseInt(c.Param("id"), 10, 64)
bill, err := h.svc.GetUpstreamBill(c.Request.Context(), id)
if err != nil {
bizResp(c, err)
return
}
rows, err := h.svc.UpstreamBillRows(c.Request.Context(), bill)
if err != nil {
bizResp(c, err)
return
}
response.Success(c, gin.H{"bill": bill, "rows": rows})
}
// upstreamBillSettle POST /settle/upstream/:id/settle 1→2+settle_record(direction=2)。
func (h *settleHandler) upstreamBillSettle(c *gin.Context) {
id, _ := strconv.ParseInt(c.Param("id"), 10, 64)
var req struct {
PayType string `json:"pay_type"`
Remark string `json:"remark"`
}
_ = c.ShouldBindJSON(&req)
operator := ""
if claims := statsClaims(c); claims != nil {
operator = claims.Username
}
rec, err := h.svc.SettleUpstreamBill(c.Request.Context(), id, req.PayType, operator, req.Remark)
if err != nil {
bizResp(c, err)
return
}
response.Success(c, rec)
}
// upstreamBillExport GET /settle/upstream/:id/export XLSX。
func (h *settleHandler) upstreamBillExport(c *gin.Context) {
id, _ := strconv.ParseInt(c.Param("id"), 10, 64)
data, name, err := h.svc.ExportUpstreamBillXLSX(c.Request.Context(), id)
if err != nil {
bizResp(c, err)
return
}
c.Header("Content-Disposition", `attachment; filename="`+name+`"`)
c.Data(200, "application/octet-stream", data)
}
// ---- 阶梯档位 ----
// ladderList GET /settle/ladder?owner_type&owner_id。
func (h *settleHandler) ladderList(c *gin.Context) {
ownerID, _ := strconv.ParseInt(c.Query("owner_id"), 10, 64)
list, err := h.svc.ListLadders(c.Request.Context(), c.Query("owner_type"), ownerID)
if err != nil {
bizResp(c, err)
return
}
response.Success(c, list)
}
// ladderCreate POST /settle/ladder。
func (h *settleHandler) ladderCreate(c *gin.Context) {
var req entity.SettleLadder
if err := c.ShouldBindJSON(&req); err != nil || req.OwnerID <= 0 {
response.Error(c, errs.InvalidParam.WithMsg("owner_type/owner_id/tier_from/price 必填"))
return
}
if err := h.svc.CreateLadder(c.Request.Context(), &req); err != nil {
bizResp(c, err)
return
}
response.Success(c, req)
}
// ladderUpdate PUT /settle/ladder/:id {tier_from?,price?}。
func (h *settleHandler) ladderUpdate(c *gin.Context) {
id, _ := strconv.ParseInt(c.Param("id"), 10, 64)
var req struct {
TierFrom *int64 `json:"tier_from"`
Price *float64 `json:"price"`
}
_ = c.ShouldBindJSON(&req)
if err := h.svc.UpdateLadder(c.Request.Context(), id, req.TierFrom, req.Price); err != nil {
bizResp(c, err)
return
}
response.Success(c, nil)
}
// ladderDelete DELETE /settle/ladder/:id。
func (h *settleHandler) ladderDelete(c *gin.Context) {
id, _ := strconv.ParseInt(c.Param("id"), 10, 64)
if err := h.svc.DeleteLadder(c.Request.Context(), id); err != nil {
bizResp(c, err)
return
}
response.Success(c, nil)
}
@@ -5,6 +5,7 @@ package v1
// gin TestMode + sqlite;claims 由中间件注入模拟(stats_handler_test 同款)。 // gin TestMode + sqlite;claims 由中间件注入模拟(stats_handler_test 同款)。
import ( import (
"bytes"
"encoding/json" "encoding/json"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
@@ -270,3 +271,100 @@ func TestSettleOrders_PermissionAndScope(t *testing.T) {
t.Fatalf("customer 列表应 403,got %d body=%s", w.Code, w.Body.String()) t.Fatalf("customer 列表应 403,got %d body=%s", w.Code, w.Body.String())
} }
} }
// TestSettleBill_FullFlow D4 出账全流程:消耗落账→生成(时间线价)→阶梯配档重算
// →确认→结账(SettleRecord)→导出;已结拒重算;settle:write 权限门。
func TestSettleBill_FullFlow(t *testing.T) {
rg, db, setClaims := newSettleRouter(t)
// 种价格+消耗(账号1:0.10 价,11-10 succ=100)。
d, _ := time.ParseInLocation("2006-01-02", "2026-11-10", time.Local)
if err := db.AutoMigrate(&entity.AccountPrice{}, &entity.SettleLadder{},
&entity.SettleCustomer{}, &entity.SettleRecord{}); err != nil {
t.Fatal(err)
}
if err := db.Create(&[]entity.AccountPrice{
{AccountID: 1, Business: "sms", Price: 0.10, EffectiveAt: d},
}).Error; err != nil {
t.Fatal(err)
}
if err := db.Create(&entity.BillingConsumeLog{
AccountID: 1, Business: "sms", StatDate: d, SuccessCount: 100,
}).Error; err != nil {
t.Fatal(err)
}
setClaims(&middleware.Claims{AccountID: 1, Username: "admin", Roles: []string{"admin"}})
// 生成:金额=100×0.10=10。
w := httptest.NewRecorder()
req := httptest.NewRequest(http.MethodPost, "/api/v1/settle/customer/generate",
strings.NewReader(`{"period":"2026-11"}`))
req.Header.Set("Content-Type", "application/json")
rg.ServeHTTP(w, req)
if w.Code != 200 || !strings.Contains(w.Body.String(), `"generated":1`) {
t.Fatalf("生成失败: %d %s", w.Code, w.Body.String())
}
// 配阶梯(0→0.05)重算:100×0.05=5。
w = httptest.NewRecorder()
req = httptest.NewRequest(http.MethodPost, "/api/v1/settle/ladder",
strings.NewReader(`{"owner_type":"account","owner_id":1,"tier_from":0,"price":0.05}`))
req.Header.Set("Content-Type", "application/json")
rg.ServeHTTP(w, req)
if w.Code != 200 {
t.Fatalf("配档失败: %d %s", w.Code, w.Body.String())
}
w = httptest.NewRecorder()
req = httptest.NewRequest(http.MethodPost, "/api/v1/settle/customer/generate",
strings.NewReader(`{"period":"2026-11"}`))
req.Header.Set("Content-Type", "application/json")
rg.ServeHTTP(w, req)
if !strings.Contains(w.Body.String(), `"recalculated":1`) {
t.Fatalf("重算失败: %s", w.Body.String())
}
// 列表校验金额 5。
w = httptest.NewRecorder()
rg.ServeHTTP(w, httptest.NewRequest(http.MethodGet, "/api/v1/settle/customer?account_id=1", nil))
if !strings.Contains(w.Body.String(), `"amount":5`) {
t.Fatalf("阶梯金额错: %s", w.Body.String())
}
// 确认→结账(SettleRecord direction=1)。
w = httptest.NewRecorder()
rg.ServeHTTP(w, httptest.NewRequest(http.MethodPost, "/api/v1/settle/customer/1/confirm", nil))
if w.Code != 200 {
t.Fatalf("确认失败: %d %s", w.Code, w.Body.String())
}
w = httptest.NewRecorder()
req = httptest.NewRequest(http.MethodPost, "/api/v1/settle/customer/1/settle",
strings.NewReader(`{"pay_type":"bank"}`))
req.Header.Set("Content-Type", "application/json")
rg.ServeHTTP(w, req)
if w.Code != 200 || !strings.Contains(w.Body.String(), `"settle_no":"SC202611-1"`) {
t.Fatalf("结账失败: %d %s", w.Code, w.Body.String())
}
// 已结拒重算。
w = httptest.NewRecorder()
req = httptest.NewRequest(http.MethodPost, "/api/v1/settle/customer/generate",
strings.NewReader(`{"period":"2026-11"}`))
req.Header.Set("Content-Type", "application/json")
rg.ServeHTTP(w, req)
if !strings.Contains(w.Body.String(), `"skipped":1`) {
t.Fatalf("已结应 skipped: %s", w.Body.String())
}
// 导出 XLSX(PK 魔数)。
w = httptest.NewRecorder()
rg.ServeHTTP(w, httptest.NewRequest(http.MethodGet, "/api/v1/settle/customer/1/export", nil))
if w.Code != 200 || !bytes.HasPrefix(w.Body.Bytes(), []byte("PK")) {
t.Fatalf("导出失败: %d", w.Code)
}
// 权限门:settle:write 恒拒 → 生成 403。
denyAll := middleware.PermissionChecker(func(*middleware.Claims, string, string) bool { return false })
rg2, _, setClaims2 := newSettleRouterWithPerm(t, denyAll)
setClaims2(&middleware.Claims{AccountID: 1, Username: "x", Roles: []string{"ops"}})
w = httptest.NewRecorder()
req = httptest.NewRequest(http.MethodPost, "/api/v1/settle/customer/generate",
strings.NewReader(`{"period":"2026-11"}`))
req.Header.Set("Content-Type", "application/json")
rg2.ServeHTTP(w, req)
if w.Code != http.StatusForbidden {
t.Fatalf("无 settle:write 应 403: %d %s", w.Code, w.Body.String())
}
}
+493
View File
@@ -0,0 +1,493 @@
// bill.go S2-D4:月结出账引擎——下家(SettleCustomer)/上家(SettleUpstream)
// 生成-确认-结账全链 + 阶梯应用 + 按天明细。
//
// 数据源(R2):下家=billing_consume_log(账号×业务×天);上家=stats_channel_daily
// (通道×天)按 channel 当前 upstream_id 归并(Q4:换绑历史不拆分,按生成时点)。
// 幂等(Q6):uk(account|upstream,period) UPSERT 重算覆盖;status=2 已结拒重算
// (ISC:039);金额=元,条→元换算只在 price.go(R6 单点)。
package settle
import (
"context"
"fmt"
"time"
"gorm.io/gorm"
"gorm.io/gorm/clause"
"go-sms/internal/model/entity"
errs "go-sms/internal/pkg/errors"
)
// PeriodBounds "YYYY-MM" → [start, nextStart);非法格式 ISC:400。
func PeriodBounds(period string) (time.Time, time.Time, error) {
start, err := time.ParseInLocation("2006-01", period, time.Local)
if err != nil {
return time.Time{}, time.Time{}, errs.InvalidParam.WithMsg("period 须为 YYYY-MM")
}
return start, start.AddDate(0, 1, 0), nil
}
// GenerateResult 生成/重算统计。
type GenerateResult struct {
Generated int `json:"generated"` // 新建
Recalculated int `json:"recalculated"` // 覆盖重算(0/1 态)
Skipped int `json:"skipped"` // 已结(status=2)跳过
}
// GenerateCustomerBills 下家账期出账:遍历当月有消耗账号,逐业务逐日计价,
// 阶梯落档覆写(Q2);单账号粒度幂等,已结跳过。
func (s *Service) GenerateCustomerBills(ctx context.Context, period string) (*GenerateResult, error) {
lo, hi, err := PeriodBounds(period)
if err != nil {
return nil, err
}
res := &GenerateResult{}
var accountIDs []int64
if err := s.db.WithContext(ctx).Model(&entity.BillingConsumeLog{}).
Where("stat_date >= ? AND stat_date < ?", lo, hi).
Distinct().Pluck("account_id", &accountIDs).Error; err != nil {
return nil, err
}
for _, accountID := range accountIDs {
var exist entity.SettleCustomer
q := s.db.WithContext(ctx).Where("account_id = ? AND period = ?", accountID, period).First(&exist)
if q.Error == nil && exist.Status == 2 {
res.Skipped++
continue
}
var rows []entity.BillingConsumeLog
if err := s.db.WithContext(ctx).
Where("account_id = ? AND stat_date >= ? AND stat_date < ?", accountID, lo, hi).
Order("stat_date").Find(&rows).Error; err != nil {
return nil, err
}
var successTotal int64
var amount float64
for _, r := range rows {
successTotal += int64(r.SuccessCount)
price, _ := s.PriceAtAccount(ctx, accountID, r.Business, r.StatDate)
amount += float64(r.SuccessCount) * price
}
// 阶梯覆写:月成功总量落档,整月单价按档价(Q2)。
if p, ok := s.LadderPrice(ctx, "account", accountID, successTotal); ok {
amount = float64(successTotal) * p
}
bill := entity.SettleCustomer{
SettleNo: fmt.Sprintf("SC%s-%d", lo.Format("200601"), accountID),
AccountID: accountID,
Period: period,
SuccessCount: successTotal,
Amount: amount,
}
if err := s.db.WithContext(ctx).Clauses(clause.OnConflict{
Columns: []clause.Column{{Name: "account_id"}, {Name: "period"}},
DoUpdates: clause.AssignmentColumns([]string{"settle_no", "success_count", "amount"}),
}).Create(&bill).Error; err != nil {
return nil, err
}
if q.Error == nil {
res.Recalculated++
} else {
res.Generated++
}
}
return res, nil
}
// GenerateUpstreamBills 上家账期出账:通道按当前 upstream_id 归并(Q4),
// 计费条数随通道 billing_mode(Q3:all=submit/success_unknown=+unknown/空=success)。
func (s *Service) GenerateUpstreamBills(ctx context.Context, period string) (*GenerateResult, error) {
lo, hi, err := PeriodBounds(period)
if err != nil {
return nil, err
}
res := &GenerateResult{}
var channelIDs []int64
if err := s.db.WithContext(ctx).Model(&entity.StatsChannelDaily{}).
Where("stat_date >= ? AND stat_date < ?", lo, hi).
Distinct().Pluck("channel_id", &channelIDs).Error; err != nil {
return nil, err
}
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
}
type upAcc struct {
count int64
amount float64
}
ups := map[int64]*upAcc{}
for _, channelID := range channelIDs {
var rows []entity.StatsChannelDaily
if err := s.db.WithContext(ctx).
Where("channel_id = ? AND stat_date >= ? AND stat_date < ?", channelID, lo, hi).
Order("stat_date").Find(&rows).Error; err != nil {
return nil, err
}
uid := upstreamOf[channelID]
if uid == 0 {
continue // 未绑上家的通道不进上家账单
}
acc := ups[uid]
if acc == nil {
acc = &upAcc{}
ups[uid] = acc
}
for _, r := range rows {
bc := billableCount(modeOf[channelID], r)
acc.count += int64(bc)
price, _ := s.PriceAtChannel(ctx, channelID, r.StatDate)
acc.amount += float64(bc) * price
}
}
for uid, acc := range ups {
var exist entity.SettleUpstream
q := s.db.WithContext(ctx).Where("upstream_id = ? AND period = ?", uid, period).First(&exist)
if q.Error == nil && exist.Status == 2 {
res.Skipped++
continue
}
amount := acc.amount
if p, ok := s.LadderPrice(ctx, "upstream", uid, acc.count); ok {
amount = float64(acc.count) * p
}
bill := entity.SettleUpstream{
SettleNo: fmt.Sprintf("US%s-%d", lo.Format("200601"), uid),
UpstreamID: uid,
Period: period,
SuccessCount: acc.count,
Amount: amount,
}
if err := s.db.WithContext(ctx).Clauses(clause.OnConflict{
Columns: []clause.Column{{Name: "upstream_id"}, {Name: "period"}},
DoUpdates: clause.AssignmentColumns([]string{"settle_no", "success_count", "amount"}),
}).Create(&bill).Error; err != nil {
return nil, err
}
if q.Error == nil {
res.Recalculated++
} else {
res.Generated++
}
}
return res, nil
}
// billableCount 通道计费口径(Q3):all=submit;success_unknown=成功+未知;
// success/空=仅成功(保守缺省)。
func billableCount(mode string, r entity.StatsChannelDaily) int {
switch mode {
case "all":
return r.SubmitCount
case "success_unknown":
return r.SuccessCount + r.UnknownCount
default:
return r.SuccessCount
}
}
// ---- 确认/结账(Q6 状态机:0草稿→1已确认→2已结账;非法迁移 ISC:039) ----
// ConfirmCustomerBill 下家账单 0→1(人工核对锁账)。
func (s *Service) ConfirmCustomerBill(ctx context.Context, id int64) error {
res := s.db.WithContext(ctx).Model(&entity.SettleCustomer{}).
Where("id = ? AND status = 0", id).Update("status", 1)
if res.Error != nil {
return res.Error
}
if res.RowsAffected == 0 {
return settleStateConflict(ctx, s.db, "settle_customer", id)
}
return nil
}
// ConfirmUpstreamBill 上家同构。
func (s *Service) ConfirmUpstreamBill(ctx context.Context, id int64) error {
res := s.db.WithContext(ctx).Model(&entity.SettleUpstream{}).
Where("id = ? AND status = 0", id).Update("status", 1)
if res.Error != nil {
return res.Error
}
if res.RowsAffected == 0 {
return settleStateConflict(ctx, s.db, "settle_upstream", id)
}
return nil
}
// SettleCustomerBill 下家结账 1→2 + SettleRecord(direction=1)同事务。
func (s *Service) SettleCustomerBill(ctx context.Context, id int64, payType, operator, remark string) (*entity.SettleRecord, error) {
return s.settleBill(ctx, false, id, payType, operator, remark)
}
// SettleUpstreamBill 上家结账(direction=2)。
func (s *Service) SettleUpstreamBill(ctx context.Context, id int64, payType, operator, remark string) (*entity.SettleRecord, error) {
return s.settleBill(ctx, true, id, payType, operator, remark)
}
// settleBill 结账公共实现:1→2 CAS + settle_record 同事务(金额快照)。
func (s *Service) settleBill(ctx context.Context, upstream bool, id int64, payType, operator, remark string) (*entity.SettleRecord, error) {
var rec entity.SettleRecord
err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
direction := int8(1)
if upstream {
direction = 2
}
res := tx.Table("settle_customer").Where("id = ? AND status = 1", id).Update("status", 2)
if upstream {
res = tx.Table("settle_upstream").Where("id = ? AND status = 1", id).Update("status", 2)
}
if res.Error != nil {
return res.Error
}
if res.RowsAffected == 0 {
table := "settle_customer"
if upstream {
table = "settle_upstream"
}
return settleStateConflict(ctx, tx, table, id)
}
var row struct {
SettleNo string
Amount float64
}
q := tx.Table("settle_customer").Where("id = ?", id)
if upstream {
q = tx.Table("settle_upstream").Where("id = ?", id)
}
if err := q.Select("settle_no", "amount").Scan(&row).Error; err != nil {
return err
}
rec = entity.SettleRecord{
SettleNo: row.SettleNo, Direction: direction, Amount: row.Amount,
PayType: payType, Operator: operator,
SettledAt: time.Now(), Remark: remark,
}
return tx.Create(&rec).Error
})
if err != nil {
return nil, err
}
return &rec, nil
}
// settleStateConflict 状态冲突 → ISC:039(不存在 → 404)。
func settleStateConflict(ctx context.Context, db *gorm.DB, table string, id int64) error {
var n int64
db.Table(table).Where("id = ?", id).Count(&n)
if n == 0 {
return errs.NotFound.WithMsg(fmt.Sprintf("结算单 %d 不存在", id))
}
return errs.OrderStatusConflict.WithMsg(fmt.Sprintf("结算单 %d 状态不允许该操作", id))
}
// ---- 查询与明细 ----
// BillQuery 账单列表条件(OwnerID:customer=account_id/upstream=upstream_id)。
type BillQuery struct {
Period string
OwnerID int64
Status *int8
Page int
PageSize int
}
// BillDayRow 账单按天明细行。
type BillDayRow struct {
Day string `json:"day"`
SuccessCount int64 `json:"success_count"`
Amount float64 `json:"amount"`
}
// ListCustomerBills 下家账单分页(id 倒序)。
func (s *Service) ListCustomerBills(ctx context.Context, q BillQuery) ([]entity.SettleCustomer, int64, error) {
db := s.db.WithContext(ctx).Model(&entity.SettleCustomer{})
if q.Period != "" {
db = db.Where("period = ?", q.Period)
}
if q.OwnerID > 0 {
db = db.Where("account_id = ?", q.OwnerID)
}
if q.Status != nil {
db = db.Where("status = ?", *q.Status)
}
var total int64
if err := db.Count(&total).Error; err != nil {
return nil, 0, err
}
if q.Page <= 0 {
q.Page = 1
}
if q.PageSize <= 0 || q.PageSize > 100 {
q.PageSize = 20
}
var list []entity.SettleCustomer
err := db.Order("id DESC").Limit(q.PageSize).Offset((q.Page - 1) * q.PageSize).Find(&list).Error
return list, total, err
}
// ListUpstreamBills 上家账单分页。
func (s *Service) ListUpstreamBills(ctx context.Context, q BillQuery) ([]entity.SettleUpstream, int64, error) {
db := s.db.WithContext(ctx).Model(&entity.SettleUpstream{})
if q.Period != "" {
db = db.Where("period = ?", q.Period)
}
if q.OwnerID > 0 {
db = db.Where("upstream_id = ?", q.OwnerID)
}
if q.Status != nil {
db = db.Where("status = ?", *q.Status)
}
var total int64
if err := db.Count(&total).Error; err != nil {
return nil, 0, err
}
if q.Page <= 0 {
q.Page = 1
}
if q.PageSize <= 0 || q.PageSize > 100 {
q.PageSize = 20
}
var list []entity.SettleUpstream
err := db.Order("id DESC").Limit(q.PageSize).Offset((q.Page - 1) * q.PageSize).Find(&list).Error
return list, total, err
}
// GetCustomerBill 下家账单单头。
func (s *Service) GetCustomerBill(ctx context.Context, id int64) (*entity.SettleCustomer, error) {
var b entity.SettleCustomer
if err := s.db.WithContext(ctx).First(&b, id).Error; err != nil {
if err == gorm.ErrRecordNotFound {
return nil, errs.NotFound.WithMsg(fmt.Sprintf("结算单 %d 不存在", id))
}
return nil, err
}
return &b, nil
}
// GetUpstreamBill 上家账单单头。
func (s *Service) GetUpstreamBill(ctx context.Context, id int64) (*entity.SettleUpstream, error) {
var b entity.SettleUpstream
if err := s.db.WithContext(ctx).First(&b, id).Error; err != nil {
if err == gorm.ErrRecordNotFound {
return nil, errs.NotFound.WithMsg(fmt.Sprintf("结算单 %d 不存在", id))
}
return nil, err
}
return &b, nil
}
// CustomerBillDays 下家账单按天明细(逐业务逐日计价加总,与出账同口径重算)。
func (s *Service) CustomerBillDays(ctx context.Context, bill *entity.SettleCustomer) ([]BillDayRow, error) {
lo, hi, err := PeriodBounds(bill.Period)
if err != nil {
return nil, err
}
var rows []entity.BillingConsumeLog
if err := s.db.WithContext(ctx).
Where("account_id = ? AND stat_date >= ? AND stat_date < ?", bill.AccountID, lo, hi).
Order("stat_date").Find(&rows).Error; err != nil {
return nil, err
}
byDay := map[string]*BillDayRow{}
var order []string
for _, r := range rows {
key := r.StatDate.Format("2006-01-02")
d, ok := byDay[key]
if !ok {
d = &BillDayRow{Day: key}
byDay[key] = d
order = append(order, key)
}
d.SuccessCount += int64(r.SuccessCount)
price, _ := s.PriceAtAccount(ctx, bill.AccountID, r.Business, r.StatDate)
d.Amount += float64(r.SuccessCount) * price
}
out := make([]BillDayRow, 0, len(order))
for _, k := range order {
out = append(out, *byDay[k])
}
return out, nil
}
// ---- 阶梯档位 CRUD(R5) ----
// ListLadders 档位列表(owner 过滤,tier_from 升序)。
func (s *Service) ListLadders(ctx context.Context, ownerType string, ownerID int64) ([]entity.SettleLadder, error) {
db := s.db.WithContext(ctx).Model(&entity.SettleLadder{})
if ownerType != "" {
db = db.Where("owner_type = ?", ownerType)
}
if ownerID > 0 {
db = db.Where("owner_id = ?", ownerID)
}
var list []entity.SettleLadder
err := db.Order("tier_from").Find(&list).Error
return list, err
}
// CreateLadder 新增档位(同 owner 同 tier_from 唯一,重复 ISC:400)。
func (s *Service) CreateLadder(ctx context.Context, l *entity.SettleLadder) error {
if l.OwnerType != "account" && l.OwnerType != "upstream" {
return errs.InvalidParam.WithMsg("owner_type 须为 account/upstream")
}
if l.TierFrom < 0 || l.Price <= 0 {
return errs.InvalidParam.WithMsg("tier_from 须≥0 且 price 须>0")
}
if err := s.db.WithContext(ctx).Create(l).Error; err != nil {
if isDuplicateKey(err) {
return errs.InvalidParam.WithMsg("该 owner 已存在同下限档位")
}
return err
}
return nil
}
// UpdateLadder 修改档位(price/tier_from;tier_from 冲突 ISC:400)。
func (s *Service) UpdateLadder(ctx context.Context, id int64, tierFrom *int64, price *float64) error {
updates := map[string]any{}
if tierFrom != nil {
if *tierFrom < 0 {
return errs.InvalidParam.WithMsg("tier_from 须≥0")
}
updates["tier_from"] = *tierFrom
}
if price != nil {
if *price <= 0 {
return errs.InvalidParam.WithMsg("price 须>0")
}
updates["price"] = *price
}
if len(updates) == 0 {
return nil
}
res := s.db.WithContext(ctx).Model(&entity.SettleLadder{}).Where("id = ?", id).Updates(updates)
if res.Error != nil {
if isDuplicateKey(res.Error) {
return errs.InvalidParam.WithMsg("该 owner 已存在同下限档位")
}
return res.Error
}
if res.RowsAffected == 0 {
return errs.NotFound.WithMsg(fmt.Sprintf("档位 %d 不存在", id))
}
return nil
}
// DeleteLadder 删除档位。
func (s *Service) DeleteLadder(ctx context.Context, id int64) error {
res := s.db.WithContext(ctx).Delete(&entity.SettleLadder{}, id)
if res.Error != nil {
return res.Error
}
if res.RowsAffected == 0 {
return errs.NotFound.WithMsg(fmt.Sprintf("档位 %d 不存在", id))
}
return nil
}
+306
View File
@@ -0,0 +1,306 @@
package settle
// bill_test.go S2-D4:出账引擎单测——**阶梯结算单测(S2 显式验收项)**:
// 恰好落档/跨档/无阶梯回退时间线价;时间线月中调价按日分档;上家三口径
// (billing_mode);生成幂等重算覆盖/已结拒;结账状态机+SettleRecord;导出。
// D4-0 口径(Q1~Q6 用户批准方案默认)见 price.go 头注。
import (
"bytes"
"context"
"testing"
"time"
"gorm.io/gorm"
"go-sms/internal/model/entity"
errs "go-sms/internal/pkg/errors"
)
// newBillDB 内存库 + 出账全家桶表。
// settle_upstream 手动建表:idx_period 与 settle_customer 同名,glebarez
// 索引名全库唯一不查重(同 recharge_test 方言坑);无索引版读写零影响。
func newBillDB(t *testing.T) *gorm.DB {
t.Helper()
db := newConsumeDB(t)
if err := db.AutoMigrate(
&entity.AccountPrice{}, &entity.ChannelPrice{}, &entity.ChannelChannel{},
&entity.SettleLadder{}, &entity.SettleCustomer{},
&entity.SettleRecord{},
); err != nil {
t.Fatal(err)
}
if err := db.Exec(`CREATE TABLE IF NOT EXISTS settle_upstream (
id INTEGER PRIMARY KEY AUTOINCREMENT,
settle_no TEXT, upstream_id INTEGER NOT NULL, period TEXT,
success_count INTEGER DEFAULT 0, amount REAL DEFAULT 0,
status INTEGER DEFAULT 0, created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
UNIQUE(upstream_id, period))`).Error; err != nil {
t.Fatal(err)
}
return db
}
// seedCustomerData 账号1:价 11-01 起 0.10、11-15 起 0.20(月中调价);
// 消耗 11-10 succ=100(fee 忽略)、11-20 succ=50 → 金额=100*0.10+50*0.20=20。
func seedCustomerData(t *testing.T, db *gorm.DB) {
t.Helper()
seedTime := func(day string) time.Time {
d, _ := time.ParseInLocation("2006-01-02", day, time.Local)
return d
}
if err := db.Create(&[]entity.AccountPrice{
{AccountID: 1, Business: "sms", Price: 0.10, EffectiveAt: seedTime("2026-11-01")},
{AccountID: 1, Business: "sms", Price: 0.20, EffectiveAt: seedTime("2026-11-15")},
}).Error; err != nil {
t.Fatal(err)
}
if err := db.Create(&[]entity.BillingConsumeLog{
{AccountID: 1, Business: "sms", StatDate: seedTime("2026-11-10"), SuccessCount: 100},
{AccountID: 1, Business: "sms", StatDate: seedTime("2026-11-20"), SuccessCount: 50},
}).Error; err != nil {
t.Fatal(err)
}
}
// TestBill_Customer_Generate 基础出账:时间线月中调价按日分档。
func TestBill_Customer_Generate(t *testing.T) {
db := newBillDB(t)
seedCustomerData(t, db)
svc := NewService(db)
ctx := context.Background()
res, err := svc.GenerateCustomerBills(ctx, "2026-11")
if err != nil {
t.Fatal(err)
}
if res.Generated != 1 || res.Recalculated != 0 {
t.Fatalf("首生成错: %+v", res)
}
var bill entity.SettleCustomer
db.First(&bill)
if bill.SettleNo != "SC202611-1" || bill.Period != "2026-11" || bill.Status != 0 {
t.Fatalf("单头错: %+v", bill)
}
if bill.SuccessCount != 150 || !feq(bill.Amount, 20.0) {
t.Fatalf("金额错: succ=%d amount=%v(期望 150/20.0=100*0.10+50*0.20)", bill.SuccessCount, bill.Amount)
}
// 幂等重算:覆盖更新不新增行。
res, err = svc.GenerateCustomerBills(ctx, "2026-11")
if err != nil || res.Generated != 0 || res.Recalculated != 1 {
t.Fatalf("重算错: %+v err=%v", res, err)
}
var n int64
db.Model(&entity.SettleCustomer{}).Count(&n)
if n != 1 {
t.Fatalf("行数=%d 期望 1", n)
}
// 状态机:0→1→2+SettleRecord;终态拒重算;非法迁移 039。
if err := svc.ConfirmCustomerBill(ctx, bill.ID); err != nil {
t.Fatal(err)
}
rec, err := svc.SettleCustomerBill(ctx, bill.ID, "bank", "ops", "test")
if err != nil {
t.Fatal(err)
}
if rec.Direction != 1 || rec.SettleNo != "SC202611-1" || !feq(rec.Amount, 20.0) {
t.Fatalf("SettleRecord 错: %+v", rec)
}
if res, _ = svc.GenerateCustomerBills(ctx, "2026-11"); res.Skipped != 1 {
t.Fatalf("已结应 skipped=1: %+v", res)
}
if err := svc.ConfirmCustomerBill(ctx, bill.ID); !isErr(err, errs.OrderStatusConflict) {
t.Fatalf("已结 confirm 应 ISC:039: %v", err)
}
if _, err := svc.SettleCustomerBill(ctx, bill.ID, "", "", ""); !isErr(err, errs.OrderStatusConflict) {
t.Fatalf("重复 settle 应 ISC:039: %v", err)
}
var recs int64
db.Model(&entity.SettleRecord{}).Count(&recs)
if recs != 1 {
t.Fatalf("SettleRecord 行数=%d 期望 1(终态幂等)", recs)
}
}
// TestBill_Customer_Ladder **阶梯结算单测(S2 显式验收项)**:
// 档位 [0→0.05, 1000→0.04];恰好落档/跨档/无阶梯回退;整月覆写口径(Q2)。
func TestBill_Customer_Ladder(t *testing.T) {
db := newBillDB(t)
seedCustomerData(t, db) // 月量 150;时间线金额 20.0
if err := db.Create(&[]entity.SettleLadder{
{OwnerType: "account", OwnerID: 1, TierFrom: 0, Price: 0.05},
{OwnerType: "account", OwnerID: 1, TierFrom: 1000, Price: 0.04},
}).Error; err != nil {
t.Fatal(err)
}
svc := NewService(db)
ctx := context.Background()
// 月量 150 → 首档 0.05 → 整月覆写 150*0.05=7.5(非时间线 20.0)。
if _, err := svc.GenerateCustomerBills(ctx, "2026-11"); err != nil {
t.Fatal(err)
}
var bill entity.SettleCustomer
db.First(&bill)
if !feq(bill.Amount, 7.5) {
t.Fatalf("首档覆写错: amount=%v 期望 7.5", bill.Amount)
}
// 恰好落档:月量 1000 → 二档 0.04 → 40.0(边界含下限)。
d20, _ := time.ParseInLocation("2006-01-02", "2026-11-20", time.Local)
db.Model(&entity.BillingConsumeLog{}).Where("stat_date = ?", d20).
Update("success_count", 900) // 100+900=1000
if _, err := svc.GenerateCustomerBills(ctx, "2026-11"); err != nil {
t.Fatal(err)
}
db.First(&bill)
if bill.SuccessCount != 1000 || !feq(bill.Amount, 40.0) {
t.Fatalf("恰好落档错: succ=%d amount=%v 期望 1000/40.0", bill.SuccessCount, bill.Amount)
}
// 删除阶梯 → 回退时间线价(Q2:无阶梯回退)。
db.Where("1=1").Delete(&entity.SettleLadder{})
if _, err := svc.GenerateCustomerBills(ctx, "2026-11"); err != nil {
t.Fatal(err)
}
db.First(&bill)
expect := 100*0.10 + 900*0.20 // 11-10 价 0.10 + 11-20 价 0.20
if !feq(bill.Amount, expect) {
t.Fatalf("无阶梯回退错: amount=%v 期望 %v", bill.Amount, expect)
}
}
// TestBill_Upstream 上家三口径(Q3)+归并(Q4)+结账(direction=2)。
func TestBill_Upstream(t *testing.T) {
db := newBillDB(t)
seedTime := func(day string) time.Time {
d, _ := time.ParseInLocation("2006-01-02", day, time.Local)
return d
}
// 上家 10:通道1(success)+通道2(all);上家 20:通道3(success_unknown)。
if err := db.Create(&[]entity.ChannelChannel{
{Model: entity.Model{ID: 1}, Name: "c1", Code: "C1", UpstreamID: 10, BillingMode: "success"},
{Model: entity.Model{ID: 2}, Name: "c2", Code: "C2", UpstreamID: 10, BillingMode: "all"},
{Model: entity.Model{ID: 3}, Name: "c3", Code: "C3", UpstreamID: 20, BillingMode: "success_unknown"},
{Model: entity.Model{ID: 4}, Name: "c4", Code: "C4", UpstreamID: 0}, // 未绑上家
}).Error; err != nil {
t.Fatal(err)
}
if err := db.Create(&[]entity.ChannelPrice{
{ChannelID: 1, Price: 0.03, EffectiveAt: seedTime("2026-11-01")},
{ChannelID: 2, Price: 0.02, EffectiveAt: seedTime("2026-11-01")},
{ChannelID: 3, Price: 0.05, EffectiveAt: seedTime("2026-11-01")},
}).Error; err != nil {
t.Fatal(err)
}
if err := db.Create(&[]entity.StatsChannelDaily{
{ChannelID: 1, StatDate: seedTime("2026-11-10"), SubmitCount: 100, SuccessCount: 80, FailCount: 10, UnknownCount: 10},
{ChannelID: 2, StatDate: seedTime("2026-11-10"), SubmitCount: 100, SuccessCount: 80, FailCount: 10, UnknownCount: 10},
{ChannelID: 3, StatDate: seedTime("2026-11-10"), SubmitCount: 100, SuccessCount: 80, FailCount: 10, UnknownCount: 10},
{ChannelID: 4, StatDate: seedTime("2026-11-10"), SubmitCount: 50, SuccessCount: 50},
}).Error; err != nil {
t.Fatal(err)
}
svc := NewService(db)
ctx := context.Background()
res, err := svc.GenerateUpstreamBills(ctx, "2026-11")
if err != nil || res.Generated != 2 {
t.Fatalf("上家生成错: %+v err=%v(期望 2:uid10/20;通道4未绑不入)", res, err)
}
var b10, b20 entity.SettleUpstream
db.Where("upstream_id = ?", int64(10)).First(&b10)
db.Where("upstream_id = ?", int64(20)).First(&b20)
// 上家10:通道1 success=80×0.03=2.4 + 通道2 all=100×0.02=2.0 → 4.4/计费180。
if b10.SuccessCount != 180 || !feq(b10.Amount, 4.4) {
t.Fatalf("上家10 三口径错: count=%d amount=%v 期望 180/4.4", b10.SuccessCount, b10.Amount)
}
// 上家20:success_unknown=80+10=90×0.05=4.5。
if b20.SuccessCount != 90 || !feq(b20.Amount, 4.5) {
t.Fatalf("上家20 口径错: count=%d amount=%v 期望 90/4.5", b20.SuccessCount, b20.Amount)
}
// 结账 direction=2 + 金额快照(状态机 0→1→2)。
if err := svc.ConfirmUpstreamBill(ctx, b10.ID); err != nil {
t.Fatal(err)
}
rec, err := svc.SettleUpstreamBill(ctx, b10.ID, "bank", "ops", "up")
if err != nil {
t.Fatal(err)
}
if rec.Direction != 2 || rec.SettleNo != b10.SettleNo || !feq(rec.Amount, 4.4) {
t.Fatalf("上家 SettleRecord 错: %+v", rec)
}
// 导出:字节流非空(XLSX 魔数 PK)。
data, name, err := svc.ExportUpstreamBillXLSX(ctx, b20.ID)
if err != nil || len(data) < 100 || name != b20.SettleNo+".xlsx" {
t.Fatalf("上家导出错: len=%d name=%s err=%v", len(data), name, err)
}
if !bytes.HasPrefix(data, []byte("PK")) {
t.Fatalf("XLSX 魔数错: % x", data[:2])
}
}
// TestBill_CustomerDetailAndExport 按天明细+导出。
func TestBill_CustomerDetailAndExport(t *testing.T) {
db := newBillDB(t)
seedCustomerData(t, db)
svc := NewService(db)
ctx := context.Background()
if _, err := svc.GenerateCustomerBills(ctx, "2026-11"); err != nil {
t.Fatal(err)
}
bill, err := svc.GetCustomerBill(ctx, 1)
if err != nil {
t.Fatal(err)
}
days, err := svc.CustomerBillDays(ctx, bill)
if err != nil || len(days) != 2 {
t.Fatalf("按天明细错: %v err=%v", days, err)
}
if days[0].Day != "2026-11-10" || days[0].SuccessCount != 100 || !feq(days[0].Amount, 10.0) {
t.Fatalf("明细行1错: %+v", days[0])
}
if days[1].SuccessCount != 50 || !feq(days[1].Amount, 10.0) {
t.Fatalf("明细行2错: %+v(50×0.20)", days[1])
}
data, name, err := svc.ExportCustomerBillXLSX(ctx, bill.ID)
if err != nil || !bytes.HasPrefix(data, []byte("PK")) || name != "SC202611-1.xlsx" {
t.Fatalf("导出错: len=%d name=%s err=%v", len(data), name, err)
}
}
// TestLadder_CRUD 档位 CRUD+重复档拒绝。
func TestLadder_CRUD(t *testing.T) {
db := newBillDB(t)
svc := NewService(db)
ctx := context.Background()
if err := svc.CreateLadder(ctx, &entity.SettleLadder{OwnerType: "account", OwnerID: 1, TierFrom: 0, Price: 0.05}); err != nil {
t.Fatal(err)
}
// 同 owner 同 tier_from → 400。
if err := svc.CreateLadder(ctx, &entity.SettleLadder{OwnerType: "account", OwnerID: 1, TierFrom: 0, Price: 0.04}); !isErr(err, errs.InvalidParam) {
t.Fatalf("重复档应 400: %v", err)
}
// 非法 owner_type。
if err := svc.CreateLadder(ctx, &entity.SettleLadder{OwnerType: "xx", OwnerID: 1, TierFrom: 0, Price: 1}); !isErr(err, errs.InvalidParam) {
t.Fatalf("非法 owner 应 400: %v", err)
}
// 更新价格 + 删除。
p := 0.045
if err := svc.UpdateLadder(ctx, 1, nil, &p); err != nil {
t.Fatal(err)
}
list, err := svc.ListLadders(ctx, "account", 1)
if err != nil || len(list) != 1 || !feq(list[0].Price, 0.045) {
t.Fatalf("档位列表错: %+v err=%v", list, err)
}
if err := svc.DeleteLadder(ctx, 1); err != nil {
t.Fatal(err)
}
if err := svc.DeleteLadder(ctx, 1); !isErr(err, errs.NotFound) {
t.Fatalf("重复删应 404: %v", err)
}
}
+111
View File
@@ -0,0 +1,111 @@
// export.go S2-D4:结算单 XLSX 导出(excelize;下家=单头+按天明细,
// 上家=单头+通道×天明细)。
package settle
import (
"bytes"
"context"
"fmt"
"github.com/xuri/excelize/v2"
"go-sms/internal/model/entity"
)
// ExportCustomerBillXLSX 下家账单导出,返回文件字节。
func (s *Service) ExportCustomerBillXLSX(ctx context.Context, id int64) ([]byte, string, error) {
bill, err := s.GetCustomerBill(ctx, id)
if err != nil {
return nil, "", err
}
days, err := s.CustomerBillDays(ctx, bill)
if err != nil {
return nil, "", err
}
f := excelize.NewFile()
sheet := "账单"
_ = f.SetSheetRow(sheet, "A1", &[]any{
"结算单号", bill.SettleNo, "账号", bill.AccountID, "账期", bill.Period,
})
_ = f.SetSheetRow(sheet, "A2", &[]any{
"成功条数", bill.SuccessCount, "金额(元)", bill.Amount, "状态", bill.Status,
})
_ = f.SetSheetRow(sheet, "A4", &[]any{"日期", "成功条数", "金额(元)"})
for i, d := range days {
_ = f.SetSheetRow(sheet, fmt.Sprintf("A%d", 5+i), &[]any{d.Day, d.SuccessCount, d.Amount})
}
var buf bytes.Buffer
if err := f.Write(&buf); err != nil {
return nil, "", err
}
return buf.Bytes(), bill.SettleNo + ".xlsx", nil
}
// UpstreamBillRow 上家账单通道×天明细行。
type UpstreamBillRow struct {
ChannelID int64 `json:"channel_id"`
Day string `json:"day"`
BillCount int `json:"bill_count"`
Price float64 `json:"price"`
Amount float64 `json:"amount"`
}
// UpstreamBillRows 上家账单通道×天明细(与出账同口径:billing_mode+时间线价)。
func (s *Service) UpstreamBillRows(ctx context.Context, bill *entity.SettleUpstream) ([]UpstreamBillRow, error) {
lo, hi, err := PeriodBounds(bill.Period)
if err != nil {
return nil, err
}
var channels []entity.ChannelChannel
if err := s.db.WithContext(ctx).Where("upstream_id = ?", bill.UpstreamID).Find(&channels).Error; err != nil {
return nil, err
}
var out []UpstreamBillRow
for _, ch := range channels {
var rows []entity.StatsChannelDaily
if err := s.db.WithContext(ctx).
Where("channel_id = ? AND stat_date >= ? AND stat_date < ?", ch.ID, lo, hi).
Order("stat_date").Find(&rows).Error; err != nil {
return nil, err
}
for _, r := range rows {
bc := billableCount(ch.BillingMode, r)
price, _ := s.PriceAtChannel(ctx, ch.ID, r.StatDate)
out = append(out, UpstreamBillRow{
ChannelID: ch.ID, Day: r.StatDate.Format("2006-01-02"),
BillCount: bc, Price: price, Amount: float64(bc) * price,
})
}
}
return out, nil
}
// ExportUpstreamBillXLSX 上家账单导出,返回文件字节。
func (s *Service) ExportUpstreamBillXLSX(ctx context.Context, id int64) ([]byte, string, error) {
bill, err := s.GetUpstreamBill(ctx, id)
if err != nil {
return nil, "", err
}
rows, err := s.UpstreamBillRows(ctx, bill)
if err != nil {
return nil, "", err
}
f := excelize.NewFile()
sheet := "账单"
_ = f.SetSheetRow(sheet, "A1", &[]any{
"结算单号", bill.SettleNo, "上家", bill.UpstreamID, "账期", bill.Period,
})
_ = f.SetSheetRow(sheet, "A2", &[]any{
"计费条数", bill.SuccessCount, "金额(元)", bill.Amount, "状态", bill.Status,
})
_ = f.SetSheetRow(sheet, "A4", &[]any{"通道", "日期", "计费条数", "单价(元)", "金额(元)"})
for i, r := range rows {
_ = f.SetSheetRow(sheet, fmt.Sprintf("A%d", 5+i),
&[]any{r.ChannelID, r.Day, r.BillCount, r.Price, r.Amount})
}
var buf bytes.Buffer
if err := f.Write(&buf); err != nil {
return nil, "", err
}
return buf.Bytes(), bill.SettleNo + ".xlsx", nil
}
+60
View File
@@ -0,0 +1,60 @@
// price.go S2-D4:生效价引擎——R1/R6 全链唯一「条→元」换算点。
//
// 口径(D4-0 用户批准方案默认):
// Q1 下家:金额=Σ(日成功条数×当日生效价);PriceAt=价格时间线 EffectiveAt≤当日
// 取最近;无价日按 0 元入账(账单明细如实体现,不阻断生成);
// Q2 阶梯:月成功总量落档后**整月单价按档位价覆写**(不做分档混合计价);
// Q3 上家 all 档=submit_count(全部提交);success_unknown=成功+未知;
// 空 billing_mode 按 success(保守)。
package settle
import (
"context"
"time"
"gorm.io/gorm"
"go-sms/internal/model/entity"
)
// PriceAtAccount 账号业务线当日生效价(时间线回溯);found=false=无价格记录。
func (s *Service) PriceAtAccount(ctx context.Context, accountID int64, business string, day time.Time) (price float64, found bool) {
lo := time.Date(day.Year(), day.Month(), day.Day(), 0, 0, 0, 0, day.Location())
var row entity.AccountPrice
err := s.db.WithContext(ctx).
Where("account_id = ? AND business = ? AND effective_at <= ?", accountID, business, lo).
Order("effective_at DESC").First(&row).Error
if err != nil {
if err == gorm.ErrRecordNotFound {
return 0, false
}
return 0, false // 查询异常按无价处理(0 元入账,对账期暴露),不阻断出账
}
return row.Price, true
}
// PriceAtChannel 通道当日生效成本价(时间线回溯);found=false=无价记录。
func (s *Service) PriceAtChannel(ctx context.Context, channelID int64, day time.Time) (price float64, found bool) {
lo := time.Date(day.Year(), day.Month(), day.Day(), 0, 0, 0, 0, day.Location())
var row entity.ChannelPrice
err := s.db.WithContext(ctx).
Where("channel_id = ? AND effective_at <= ?", channelID, lo).
Order("effective_at DESC").First(&row).Error
if err != nil {
return 0, false
}
return row.Price, true
}
// LadderPrice 阶梯落档:owner 月成功(或计费)总量命中的最高档单价;
// found=false=该 owner 未配阶梯(回退时间线价,Q2)。
func (s *Service) LadderPrice(ctx context.Context, ownerType string, ownerID, monthCount int64) (price float64, found bool) {
var row entity.SettleLadder
err := s.db.WithContext(ctx).
Where("owner_type = ? AND owner_id = ? AND tier_from <= ?", ownerType, ownerID, monthCount).
Order("tier_from DESC").First(&row).Error
if err != nil {
return 0, false
}
return row.Price, true
}
+3 -3
View File
@@ -28,10 +28,10 @@ const orderNoRetry = 1
// maxRechargeCount 到账条数上限(与 account.MaxRechargeAmount 同值,不跨包依赖)。 // maxRechargeCount 到账条数上限(与 account.MaxRechargeAmount 同值,不跨包依赖)。
const maxRechargeCount int64 = 10_000_000_000 const maxRechargeCount int64 = 10_000_000_000
// isDuplicateKey 唯一键冲突判定(MySQL 1062/DUPLICATE 与 SQLite 兼容, // isDuplicateKey 唯一键冲突判定(MySQL 1062/DUPLICATE 与 SQLite 2067
// 同 send/consume.isDupTaskNo 口径)。 // 兼容;统一大写,同 send/consume.isDupTaskNo 口径)。
func isDuplicateKey(err error) bool { func isDuplicateKey(err error) bool {
msg := err.Error() msg := strings.ToUpper(err.Error())
return strings.Contains(msg, "DUPLICATE") || strings.Contains(msg, "1062") || return strings.Contains(msg, "DUPLICATE") || strings.Contains(msg, "1062") ||
strings.Contains(msg, "UNIQUE CONSTRAINT") strings.Contains(msg, "UNIQUE CONSTRAINT")
} }
+8 -7
View File
@@ -1,13 +1,14 @@
# 当前工作上下文(最近更新:2026-11-14) # 当前工作上下文(最近更新:2026-11-14)
## 当前状态快照(2026-11-14 夜,**S2-D3 收官,进度 3/5**) ## 当前状态快照(2026-11-14 深夜,**S2-D4 收官,进度 4/5**)
- **仓库**:main 已推 Gitea(origin=192.168.5.27:24401/Tory/go-sms-V2);每日 bundle+push 双轨。 - **仓库**:main 已推 Gitea;每日 bundle+push 双轨。
- **S2 进度 3/5**:D1 表设计+v20+契约 / D2 消耗日汇总(滚动重刷)/ **D3 ✅ 充值审核流**——recharge.go(创建 0 态不动余额/confirm 单事务 CAS+余额自增+流水 ref_id=order_no/驳回)+ISC:039(三处同步 52 码)+四端点(二级权限+平台角色门);测试 7 件含**并发 confirm 恰一成功(-race)**;**真机全链冒烟**(HS256 临时 token:创建→confirm 余额+123→重复 409;流水 ref_id+审计 module=billing 留痕两设计实证;数据已还原)。-race 39 包/lint 0。 - **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)经方案批准生效。
- **24h 稳定性门槛 ✅ 终判通过**(18:02;S1 完全闭环,S5 压测前置确认)。 - **⚠️ 流程补正在途**:七件套「本人走查」项——走查脚本已备 `docs/acceptance/scripts/s2-walkthrough.sh`(D2/D3 全覆盖+D4 出账链),**待用户执行后回填 s2-d2/d3/d4 验收单**;D5 收官时一并完成 S2 域级用户验收。
- **六项裁决速查**:R1 出账时刻计价(D4 price.go 单点推导)/R2 事实源=billing_consume_log+stats_channel_daily(D2 已落账)/R3 双通道(D3 已落地:即时充值流水 ref_id 空 vs 订单流=order_no,D5 对账区分锚点)/R4 rebate_rate/R5 settle_ladder/R6 条/元换算只在出账引擎。 - **24h 稳定性门槛 ✅ 终判通过**(S1 完全闭环,S5 压测前置确认)。
- **下一步=S2-D4 出账引擎+阶梯**(显式验收:阶梯结算单测):price.go(PriceAt 时间线回溯 EffectiveAt≤当日取最近+阶梯落档覆写)+bill.go(customer/upstream 生成-确认-结账-settle_record+XLSX 导出);幂等=uk(account|upstream,period)+status=2 拒重算;上家口径随通道 billing_mode(success/success_unknown/all);**月结建议 T+4 后生成**(滚动重刷 72h 收敛语义)。随后 D5 利润/返点/三方对账(S2 出口 diff=0)。 - **六项裁决速查**:R1/R6 换算只在 price.go(已落地)/R2 事实源 D2 落账/R3 双通道 D3 落地(ref_id 区分)/R4 rebate_rate(D5 消费)/R5 settle_ladder(D4 落地)。
- 归档仓(只读):/data/poc-archive/repos/go-sms.git(poc-final=5e09a4cc)。 - **下一步=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。
- 归档仓(只读):/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 分支已生效,排查须看全量输出)。 - **本会话运维教训**:①`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 裁决 / 盘点 / 迁移方案) ## 重建启动(2026-11-12 裁决 / 盘点 / 迁移方案)
+2 -1
View File
@@ -14,7 +14,8 @@
| S2-D1 表设计+v20+契约 | 六项裁决(R1 出账时刻计价/R2 事实源统一/R3 充值双通道/R4 返点/R5 阶梯表/R6 口径)+v20_settle_domain+openapi v1.3.0(+20 端点)+dev 库实跑 v20 | ✅ 2026-11-14(评审纪要 docs/review/s2-settle-table-review.md;验收单 s2-d1.md) | | S2-D1 表设计+v20+契约 | 六项裁决(R1 出账时刻计价/R2 事实源统一/R3 充值双通道/R4 返点/R5 阶梯表/R6 口径)+v20_settle_domain+openapi v1.3.0(+20 端点)+dev 库实跑 v20 | ✅ 2026-11-14(评审纪要 docs/review/s2-settle-table-review.md;验收单 s2-d1.md) |
| S2-D2 消耗日汇总引擎 | settle/consume.go+job.go(**滚动重刷模型**:1h 重刷近 4 天,修正单日 T+1 的 72h 失真)+两端点+config/metrics/装配;sqlite 6 测试;真 MySQL 端到端+收敛实证 | ✅ 2026-11-14 傍晚(验收单 s2-d2.md) | | S2-D2 消耗日汇总引擎 | settle/consume.go+job.go(**滚动重刷模型**:1h 重刷近 4 天,修正单日 T+1 的 72h 失真)+两端点+config/metrics/装配;sqlite 6 测试;真 MySQL 端到端+收敛实证 | ✅ 2026-11-14 傍晚(验收单 s2-d2.md) |
| S2-D3 充值审核流 | recharge.go(创建/confirm 单事务 CAS+余额自增+流水 ref_id=order_no/驳回/列表)+ISC:039 三处同步+四端点(二级权限+平台角色门);测试 7 件含并发 confirm;真机全链冒烟+审计留痕实证 | ✅ 2026-11-14 夜(验收单 s2-d3.md) | | S2-D3 充值审核流 | recharge.go(创建/confirm 单事务 CAS+余额自增+流水 ref_id=order_no/驳回/列表)+ISC:039 三处同步+四端点(二级权限+平台角色门);测试 7 件含并发 confirm;真机全链冒烟+审计留痕实证 | ✅ 2026-11-14 夜(验收单 s2-d3.md) |
| S2-D4~D5 | D4 出账+阶梯(显式验收:阶梯结算单测)/D5 利润返点+三方对账(diff=0=S2 出口) | ⬜ 排期中 | | S2-D4 出账+阶梯 | price.go(R1/R6 唯一换算)+bill.go(生成/确认/结账/SettleRecord/ladder)+export.go XLSX+15 端点;**阶梯结算单测(S2 显式验收项)**+上家三口径+状态机;真机出账全链(阶梯覆写/结账/真 XLSX) | ✅ 2026-11-14 深夜(验收单 s2-d4.md;用户走查在途补正) |
| S2-D5 | 利润/返点+三方对账(diff=0=S2 出口)+S2 收官走查 | ⬜ 排期中 |
| 观察项 | 24h 稳定性门槛(11-13 17:55 起计;期内 21:33 宿主主动重启=已知事件不判失败)期满核验 11-14 17:55 | ✅ 2026-11-14 18:02 终判通过(dmesg 0/零重启/驻留+md5 一致;S5 压测前置确认,S1 完全闭环) | | 观察项 | 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》 | | S2~S5 | 结算域/前端收尾/C1C2+冷热/基线与灰度 | ⬜ 见《Go-sms-重建计划.md》 |