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:
@@ -13,6 +13,7 @@ import (
|
||||
|
||||
"go-sms/internal/config"
|
||||
"go-sms/internal/middleware"
|
||||
"go-sms/internal/model/entity"
|
||||
errs "go-sms/internal/pkg/errors"
|
||||
"go-sms/internal/pkg/response"
|
||||
"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)
|
||||
protected.POST("/billing/orders/:id/reject",
|
||||
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 模式,仅
|
||||
@@ -231,3 +256,264 @@ func (h *settleHandler) orderReject(c *gin.Context) {
|
||||
}
|
||||
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 同款)。
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"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())
|
||||
}
|
||||
}
|
||||
|
||||
// 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())
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user