fix(v2): 回调按 SettleResult 分终态/可重试——amount_mismatch 回 200 停投,不再无限重投

This commit is contained in:
wangjia
2026-07-10 11:44:14 +08:00
parent a633b2ac0a
commit 6cbaa59db7
2 changed files with 76 additions and 6 deletions
+64 -1
View File
@@ -30,6 +30,12 @@ func (oneResolver) Resolve(sku string) (int64, string, string, string, error) {
}
func buildEngine(t *testing.T) *gin.Engine {
t.Helper()
r, _ := buildEngineWithStore(t)
return r
}
func buildEngineWithStore(t *testing.T) (*gin.Engine, *store.OrderStore) {
t.Helper()
gin.SetMode(gin.TestMode)
orders := store.NewOrderStore(model.OpenTestDB(t))
@@ -41,7 +47,7 @@ func buildEngine(t *testing.T) *gin.Engine {
g := gateway.New(orders, preg, areg, oneResolver{}, nopEnqueuer{}, "global")
r := gin.New()
router.SetupV2(r, g)
return r
return r, orders
}
func do(t *testing.T, r *gin.Engine, method, path string, body any) (*httptest.ResponseRecorder, map[string]any) {
@@ -99,3 +105,60 @@ func TestV2OrderLifecycle(t *testing.T) {
t.Fatalf("cancel = %d %v", wCancel.Code, outCancel)
}
}
// TestV2CallbackAmountMismatchIs200Terminal 覆盖 P2-7 审查发现:金额/币种不符是终态,
// 渠道无需(也不该)重投,回调必须回 200 停投,而不是 400 触发无限重投。
func TestV2CallbackAmountMismatchIs200Terminal(t *testing.T) {
r, orders := buildEngineWithStore(t)
w, out := do(t, r, http.MethodPost, "/api/v2/orders", map[string]any{"sku": "pro_year", "method": "fake"})
if w.Code != http.StatusOK {
t.Fatalf("create code=%d body=%v", w.Code, out)
}
orderNo := out["data"].(map[string]any)["order_no"].(string)
atts, err := orders.ListAttemptsByStatus(model.AttemptPending, 10)
if err != nil || len(atts) == 0 {
t.Fatalf("无 pending 尝试: %v", err)
}
var ref string
for _, a := range atts {
if a.OutTradeNo == orderNo {
ref = a.ProviderRef
}
}
if ref == "" {
t.Fatalf("未找到订单 %s 的尝试", orderNo)
}
// 币种正确但少付(amount_minor=1 << 应收 29990000)→ amount_mismatch,终态,必须 200。
wc, outc := do(t, r, http.MethodPost, "/api/v2/callback/fake", map[string]any{
"provider_ref": ref, "status": "succeeded", "amount_minor": 1, "currency": "USDT",
})
if wc.Code != http.StatusOK {
t.Fatalf("amount_mismatch callback code=%d body=%v (终态应 200 停投,不应 400 触发无限重投)", wc.Code, outc)
}
if outc["result"] != string(gateway.SettleAmountMismatch) {
t.Fatalf("result = %v, want amount_mismatch", outc["result"])
}
// 订单应仍是 pending(未被误标为已支付)。
_, outStatus := do(t, r, http.MethodGet, "/api/v2/orders/"+orderNo, nil)
if outStatus["data"].(map[string]any)["status"] != "pending" {
t.Fatalf("order status = %v, want pending", outStatus["data"])
}
}
// TestV2CallbackMalformedBodyIs400Transient 验签/解析失败是瞬时态,渠道应重投,故回 400。
func TestV2CallbackMalformedBodyIs400Transient(t *testing.T) {
r := buildEngine(t)
req := httptest.NewRequest(http.MethodPost, "/api/v2/callback/fake", bytes.NewBufferString("not-json"))
req.Header.Set("Content-Type", "application/json")
w := httptest.NewRecorder()
r.ServeHTTP(w, req)
if w.Code != http.StatusBadRequest {
t.Fatalf("malformed body callback code=%d, want 400", w.Code)
}
}