优化结构

internal/data/payment/migrations.go

@@ -11,6 +11,5 @@ func Migrations() []migration.Step {
 		{ID: "202608200003_payment_schema", Migrate: func(db *gorm.DB) error {
 			return migration.CreateMissingTables(db, &paymentOrderPO{})
 		}},
-		{ID: "202608200004_payment_defaults", Migrate: ensurePaymentIntegrationConfigs},
 	}
 }

internal/data/payment/payment.go

@@ -271,16 +271,22 @@ func recordPaymentTestError(ctx context.Context, data Provider, provider, tradeN
 }
 
 func (r *paymentRepo) testRow(ctx context.Context, provider string) (map[string]any, error) {
-	var row dataintegration.ConfigPO
-	if err := r.data.DB().WithContext(ctx).Where("kind = ? AND provider = ?", integrationbiz.IntegrationKindPayment, provider).First(&row).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
+	if r == nil || r.config == nil {
+		return nil, errors.New("支付配置仓储未接入")
+	}
+	config, err := r.config.ReadPaymentConfig(ctx, provider)
+	if err != nil {
+		if errors.Is(err, integrationbiz.ErrPaymentConfigNotFound) {
 			return nil, bizpayment.ErrPaymentProviderNotFound
 		}
 		return nil, err
 	}
+	if config == nil {
+		return nil, errors.New("支付配置为空")
+	}
 	values := map[string]any{}
-	if err := json.Unmarshal([]byte(row.Config), &values); err != nil {
-		return nil, fmt.Errorf("支付配置格式错误: %w", err)
+	if err := json.Unmarshal(config.Values, &values); err != nil || values == nil {
+		return nil, errors.New("支付配置格式错误")
 	}
 	return values, nil
 }

internal/data/payment/testing_support_test.go

@@ -2,11 +2,9 @@ package payment
 
 import (
 	"fmt"
-	"testing"
 
 	"github.com/glebarez/sqlite"
 	"gorm.io/gorm"
-	dataintegration "kra/internal/data/integration"
 )
 
 type Data struct{ gormDB *reloadableDB }
@@ -30,32 +28,3 @@ func openWithDriver(driver, dsn string) (*gorm.DB, error) {
 	}
 	return gorm.Open(sqlite.Open(dsn), &gorm.Config{})
 }
-
-func openIntegrationConfigTestDB(t *testing.T) *gorm.DB {
-	t.Helper()
-	db, err := openWithDriver("sqlite", "file:"+t.Name()+"?mode=memory&cache=shared")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := db.AutoMigrate(&dataintegration.ConfigPO{}); err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() {
-		if sqlDB, err := db.DB(); err == nil {
-			_ = sqlDB.Close()
-		}
-	})
-	return db
-}
-
-func migrateAll(db *gorm.DB) error {
-	if err := db.AutoMigrate(&dataintegration.ConfigPO{}); err != nil {
-		return err
-	}
-	for _, step := range Migrations() {
-		if err := step.Migrate(db); err != nil {
-			return err
-		}
-	}
-	return nil
-}