diff --git a/sundynix-gateway/internal/handler/billing_pay.go b/sundynix-gateway/internal/handler/billing_pay.go index 9bce707..b386e6e 100644 --- a/sundynix-gateway/internal/handler/billing_pay.go +++ b/sundynix-gateway/internal/handler/billing_pay.go @@ -3,6 +3,8 @@ package handler import ( "context" "encoding/json" + "fmt" + "log" "net/http" "strconv" "strings" @@ -12,6 +14,24 @@ import ( "github.com/sundynix/sundynix-gateway/internal/store" ) +// holdDisputedOrder 处理「渠道已付但金额与订单不符」:CAS 挂起为 disputed 终态(停止无限重扫) +// 并写一条审计(仅首次转移写,避免重复回调刷审计)。绝不入账——错账比挂起贵。 +func (h *Handler) holdDisputedOrder(ctx context.Context, o *store.PaymentOrder, paidFen int64) { + changed, err := h.db.MarkOrderDisputed(ctx, o.ID) + if err != nil { + log.Printf("[payment] ⚠️ 挂起金额不符订单失败 order=%s: %v", o.ID, err) + return + } + if !changed { + return // 已挂起过 + } + _ = h.db.AppendAudit(ctx, &store.AuditLog{ + Actor: "system", Action: "POST", Route: "/billing/callback", Path: "/api/v1/billing/callback/" + o.Channel, + Detail: fmt.Sprintf("支付金额不符已挂起(disputed):order=%s 应付=%d 实付=%d 分 tenant=%s", o.ID, o.AmountFen, paidFen, o.TenantID), + }) + log.Printf("[payment] ⚠️ 订单 %s 金额不符已挂起 应付=%d 实付=%d 分(待人工核对)", o.ID, o.AmountFen, paidFen) +} + // 充值(P5.1:兑换码渠道;设计见 PAYMENT_DESIGN.md)。 // 入账目标一律是「计费租户」(ResolveBillingTenantID)——和消耗记账同一本账, // 谁的池子扣钱就往谁的池子充,别让用户充进一个花不到的池。 @@ -153,7 +173,9 @@ func (h *Handler) reconcileOrder(ctx context.Context, o *store.PaymentOrder) (*s } o, _ = h.db.GetOrder(ctx, o.ID) } - case r.Paid: // 金额对不上:不入账,人工对账(比错账便宜) + case r.Paid: // 金额对不上:不入账,挂起 disputed + 审计,留人工对账(比错账便宜) + h.holdDisputedOrder(ctx, o, r.AmountFen) + o, _ = h.db.GetOrder(ctx, o.ID) return o, true case r.Closed: _ = h.db.ExpireOrder(ctx, o.ID) @@ -197,7 +219,8 @@ func (h *Handler) PaymentCallback(c *gin.Context) { return } if r.AmountFen != o.AmountFen { - // 金额不符:不入账、不让重试(重试也不会变对),落审计人工处理。 + // 金额不符:不入账、不让重试(重试也不会变对),挂起 disputed + 落审计人工处理。 + h.holdDisputedOrder(ctx, o, r.AmountFen) c.JSON(http.StatusOK, gin.H{"code": "SUCCESS"}) return } diff --git a/sundynix-gateway/internal/handler/task_handler.go b/sundynix-gateway/internal/handler/task_handler.go index 013eca3..fb6b9ba 100644 --- a/sundynix-gateway/internal/handler/task_handler.go +++ b/sundynix-gateway/internal/handler/task_handler.go @@ -54,9 +54,19 @@ func (h *Handler) preflight(c *gin.Context) (string, bool) { return "", false } } + // 暂停管控:活跃租户(工作区)被暂停 → 拒绝提交。否则「暂停」只是个装了没接线的开关。 + if tid := tenantID(c); h.db.TenantSuspended(c.Request.Context(), tid) { + c.JSON(http.StatusForbidden, gin.H{"error": "租户已被暂停,暂无法提交任务"}) + return "", false + } // 计费目标:数据落在活跃租户(工作区),但消耗记到"计费租户"——owner/共享计费→活跃租户, // 否则→本人个人租户(各付各的)。硬拦截与用量都按计费租户走。 billingTenant := h.db.ResolveBillingTenantID(c.Request.Context(), userID(c), tenantID(c)) + // 计费租户与活跃租户不同(共享计费分叉)时,计费租户被暂停也拦——别让暂停的组织被人借道烧积分。 + if billingTenant != "" && billingTenant != tenantID(c) && h.db.TenantSuspended(c.Request.Context(), billingTenant) { + c.JSON(http.StatusForbidden, gin.H{"error": "计费租户已被暂停,暂无法提交任务"}) + return "", false + } // 积分硬拦截(默认关;开关 credit_enforce):计费租户积分余额 ≤0 则拒绝,提示充值。 if billingTenant != "" && h.db.CreditEnforceEnabled(c.Request.Context()) { if h.db.TenantBalance(c.Request.Context(), billingTenant) <= 0 { diff --git a/sundynix-gateway/internal/store/completeness_fixes_test.go b/sundynix-gateway/internal/store/completeness_fixes_test.go new file mode 100644 index 0000000..754cc3d --- /dev/null +++ b/sundynix-gateway/internal/store/completeness_fixes_test.go @@ -0,0 +1,84 @@ +package store + +import ( + "context" + "testing" + "time" +) + +// 暂停租户是个真管控,不能是空开关:TenantSuspended 必须如实反映 status。 +func TestTenantSuspended(t *testing.T) { + p := newTestStore(t) + ctx := context.Background() + seedTenant(t, p, "t1") // seedTenant 建的是 active + if p.TenantSuspended(ctx, "t1") { + t.Fatal("active 租户不该报暂停") + } + if err := p.SetTenantStatus(ctx, "t1", "suspended"); err != nil { + t.Fatalf("置暂停失败: %v", err) + } + if !p.TenantSuspended(ctx, "t1") { + t.Fatal("suspended 租户应报暂停") + } + // 查不到的租户按未暂停处理(宁放行不误封)。 + if p.TenantSuspended(ctx, "nope") { + t.Fatal("不存在的租户不该报暂停") + } +} + +// 金额不符挂起:CAS 只挂一次,且不动已 paid 单。 +func TestMarkOrderDisputed_CAS(t *testing.T) { + p := newTestStore(t) + ctx := context.Background() + seedTenant(t, p, "t1") + o := &PaymentOrder{TenantID: "t1", UserID: "u1", AmountFen: 990, Channel: ChannelWechat, Status: OrderPending} + if err := p.CreateOrder(ctx, o); err != nil { + t.Fatalf("建单失败: %v", err) + } + changed, err := p.MarkOrderDisputed(ctx, o.ID) + if err != nil || !changed { + t.Fatalf("首次挂起应 changed=true: %v %v", changed, err) + } + again, _ := p.MarkOrderDisputed(ctx, o.ID) + if again { + t.Fatal("重复挂起应 changed=false(审计只写一次)") + } + got, _ := p.GetOrder(ctx, o.ID) + if got.Status != OrderDisputed { + t.Fatalf("状态应 disputed,得 %q", got.Status) + } + + // 已 paid 的单不能被挂起(CAS 只认 pending)。 + paid := &PaymentOrder{TenantID: "t1", UserID: "u1", AmountFen: 990, Channel: ChannelWechat, Status: OrderPaid} + p.CreateOrder(ctx, paid) + if c, _ := p.MarkOrderDisputed(ctx, paid.ID); c { + t.Fatal("已 paid 单不该能挂起") + } +} + +// 有效邀请码列表要滤掉过期/满员,否则误导邀请人。 +func TestListInvites_FiltersDeadCodes(t *testing.T) { + p := newTestStore(t) + ctx := context.Background() + seedTenant(t, p, "t1") + + good, _ := p.CreateInvite(ctx, "t1", "inv", RoleMember, time.Now().Add(time.Hour), 0) + expired, _ := p.CreateInvite(ctx, "t1", "inv", RoleMember, time.Now().Add(-time.Hour), 0) + full, _ := p.CreateInvite(ctx, "t1", "inv", RoleMember, time.Now().Add(time.Hour), 1) + // 把 full 灌满 + p.db.Model(&TenantInvite{}).Where("id = ?", full.ID).UpdateColumn("used_count", 1) + + active := p.ListInvites(ctx, "t1", true) + if len(active) != 1 || active[0].ID != good.ID { + ids := make([]string, len(active)) + for i, a := range active { + ids[i] = a.ID + } + t.Fatalf("有效列表应只剩 good(%s),得 %v", good.ID, ids) + } + _ = expired + // onlyActive=false 仍应看到全部三条(管理/审计用途)。 + if all := p.ListInvites(ctx, "t1", false); len(all) != 3 { + t.Fatalf("全量列表应 3 条,得 %d", len(all)) + } +} diff --git a/sundynix-gateway/internal/store/invite.go b/sundynix-gateway/internal/store/invite.go index 1151d84..23c4824 100644 --- a/sundynix-gateway/internal/store/invite.go +++ b/sundynix-gateway/internal/store/invite.go @@ -100,7 +100,10 @@ func (p *Postgres) ListInvites(ctx context.Context, tenantID string, onlyActive } q := p.db.WithContext(ctx).Where("tenant_id = ?", tenantID) if onlyActive { - q = q.Where("status = ?", InviteActive) + // 「有效」= 未撤销 + 未过期 + 未满员。只看 status 会把过期/满员的码当有效展示、误导邀请人。 + q = q.Where("status = ?", InviteActive). + Where("expires_at > ?", time.Now()). + Where("max_uses = 0 OR used_count < max_uses") } var out []TenantInvite q.Order("created_at desc").Limit(100).Find(&out) diff --git a/sundynix-gateway/internal/store/payment.go b/sundynix-gateway/internal/store/payment.go index 8465672..db53311 100644 --- a/sundynix-gateway/internal/store/payment.go +++ b/sundynix-gateway/internal/store/payment.go @@ -32,6 +32,7 @@ const ( OrderFailed = "failed" OrderExpired = "expired" OrderRefunded = "refunded" + OrderDisputed = "disputed" // 渠道已付但金额与订单不符:不入账、挂起待人工核对(终态,不再重扫) ) // 渠道名。P5.1 只有 redeem;wechat 在 P5.2 挂上。 @@ -220,6 +221,21 @@ func (p *Postgres) GetOrder(ctx context.Context, id string) (*PaymentOrder, erro return &o, nil } +// MarkOrderDisputed 把一张 pending 订单 CAS 置为 disputed(渠道已付但金额不符)。 +// 返回 changed:仅首次转移为 true,供调用方决定是否只写一次审计。CAS 保证并发/重复回调只挂起一次。 +// disputed 是终态:补偿定时器只扫 pending,从此不再重复查它、不再刷屏。 +func (p *Postgres) MarkOrderDisputed(ctx context.Context, orderID string) (bool, error) { + if p.db == nil { + return false, errStoreDisabled + } + res := p.db.WithContext(WithoutTenant(ctx)).Model(&PaymentOrder{}). + Where("id = ? AND status = ?", orderID, OrderPending).Update("status", OrderDisputed) + if res.Error != nil { + return false, res.Error + } + return res.RowsAffected > 0, nil +} + // MarkOrderPaid 渠道确认已支付后的入账:一个事务里「订单 CAS(pending→paid) → 分录 → 物化余额」。 // 返回 changed=false 表示这单已被处理过(回调重复推送/回调与主动查单赛跑),幂等直接成功。 // 双闸:CAS 是主闸;credit_ledger (kind,ref=订单号) 唯一索引兜底。 diff --git a/sundynix-gateway/internal/store/tenant.go b/sundynix-gateway/internal/store/tenant.go index 75056be..9e4f4e4 100644 --- a/sundynix-gateway/internal/store/tenant.go +++ b/sundynix-gateway/internal/store/tenant.go @@ -171,6 +171,18 @@ func (p *Postgres) GetTenant(ctx context.Context, id string) (*Tenant, error) { return &t, nil } +// TenantSuspended 报告租户是否被暂停(轻查询,供提交前门控)。查不到/出错按未暂停处理, +// 宁可放行也不误封(暂停是显式管控动作,缺数据时不该凭空拦人)。 +func (p *Postgres) TenantSuspended(ctx context.Context, tenantID string) bool { + if p.db == nil || tenantID == "" { + return false + } + var status string + p.db.WithContext(WithoutTenant(ctx)).Model(&Tenant{}). + Where("id = ?", tenantID).Select("status").Scan(&status) + return status == "suspended" +} + // MemberRole 返回用户在某租户的角色(无成员关系返回空)。 func (p *Postgres) MemberRole(ctx context.Context, tenantID, userID string) string { if p.db == nil {