wangjia
8051b0fb16
1. CreateOrderInput/RetryOrder 加 Metadata 通道,handler 白名单过滤(is_mobile/render)
后原样传给 provider.CreateRequest;alipay adapter 据 is_mobile 选 wap/page。
2. alipay adapter 移植 v1 当面付(TradePreCreate):Metadata["render"]=="qr" → 二维码
render_type,payload={qr_content,display_amount,currency},默认 2 小时窗口。
3. NewOutTradeNo 随机部分 8→16 hex 防生日碰撞(仍 <=64 字符,合规 DB 列/支付宝上限);
v2 改状态端点(下单/重试/取消)加 per-IP 内存令牌桶限流,默认开 30/min,
config.rate_limit.disabled 可关;callback/GET 查询不限。
顺带修:internal/reconcile/sync_test.go 的 gateway.New 调用漏传 refunds store,
预先存在的编译期回归(与本次改动无关,但挡住 go test ./... 全绿,一并修掉)。
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013nMthbVEmQquxBRKb9Fj8u
73 lines
2.8 KiB
Go
73 lines
2.8 KiB
Go
package reconcile_test
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/wangjia/pay/config"
|
|
"github.com/wangjia/pay/internal/accounts"
|
|
"github.com/wangjia/pay/internal/gateway"
|
|
"github.com/wangjia/pay/internal/model"
|
|
"github.com/wangjia/pay/internal/provider"
|
|
"github.com/wangjia/pay/internal/provider/fake"
|
|
"github.com/wangjia/pay/internal/reconcile"
|
|
"github.com/wangjia/pay/internal/store"
|
|
)
|
|
|
|
type stubResolver struct{}
|
|
|
|
func (stubResolver) Resolve(sku, currency string) (int64, string, string, error) {
|
|
return 29990000, "Pro", "pro_year", nil
|
|
}
|
|
|
|
type nopEnq struct{}
|
|
|
|
// Enqueue 签名依当前仓库 gateway.WebhookEnqueuer(4 个 string + map;brief 草稿只写 3 个 —
|
|
// P4 T2 之后加了 refundID 参数,此处适配现状,见 task-5-report.md 记录的漂移)。
|
|
func (nopEnq) Enqueue(_, _, _, _ string, _ map[string]any) error { return nil }
|
|
|
|
func TestSyncPendingTaskSettlesViaQuery(t *testing.T) {
|
|
db := model.OpenTestDB(t)
|
|
orders := store.NewOrderStore(db)
|
|
refunds := store.NewRefundStore(db)
|
|
preg := provider.NewRegistry()
|
|
fp := fake.New()
|
|
preg.Register(fp)
|
|
areg := accounts.New([]config.AccountConfig{{AccountID: "fake-a1", Channel: "fake", Region: "global", Enabled: true}})
|
|
gw := gateway.New(orders, refunds, preg, accounts.NewRouter(areg, nil, nil), stubResolver{}, nopEnq{}, "global")
|
|
|
|
res, _ := gw.CreateOrder(context.Background(), gateway.CreateOrderInput{SKU: "pro_year", Method: "fake", BizSystem: "pangolin", BizRef: "u-1"})
|
|
atts, _ := orders.ListAttemptsByStatus(model.AttemptPending, 10)
|
|
fp.SetQueryResult(atts[0].ProviderRef, provider.PaidEvent{
|
|
ProviderRef: atts[0].ProviderRef, Status: provider.PaidSucceeded, PaidAmountMinor: 29990000, PaidCurrency: "USDT"})
|
|
|
|
task := reconcile.SyncPendingTask(gw, 50)
|
|
if err := task(context.Background()); err != nil {
|
|
t.Fatalf("task: %v", err)
|
|
}
|
|
o, _ := orders.GetOrder(res.OrderNo)
|
|
if o.Status != model.OrderPaidV2 {
|
|
t.Fatalf("查单对账后应 paid, got %v", o.Status)
|
|
}
|
|
}
|
|
|
|
func TestPaidSpotCheckTaskRunsCleanOnConsistent(t *testing.T) {
|
|
db := model.OpenTestDB(t)
|
|
orders := store.NewOrderStore(db)
|
|
preg := provider.NewRegistry()
|
|
fp := fake.New()
|
|
preg.Register(fp)
|
|
now := time.Date(2026, 7, 10, 12, 0, 0, 0, time.UTC)
|
|
paid := now.Add(-10 * time.Minute)
|
|
_ = orders.CreateAttempt(&model.Attempt{OutTradeNo: "O1", Channel: "fake", ProviderRef: "R-O1",
|
|
AmountMinor: 100, Currency: "USDT", Status: model.AttemptPaid, PaidAt: &paid})
|
|
// 渠道侧查单仍报 succeeded 同额 → 一致,无告警。
|
|
fp.SetQueryResult("R-O1", provider.PaidEvent{ProviderRef: "R-O1", Status: provider.PaidSucceeded, PaidAmountMinor: 100, PaidCurrency: "USDT"})
|
|
|
|
task := reconcile.PaidSpotCheckTask(orders, preg, time.Hour, func() time.Time { return now })
|
|
if err := task(context.Background()); err != nil {
|
|
t.Fatalf("spotcheck: %v", err) // 只求不报错、不 panic;漂移检测走日志
|
|
}
|
|
}
|