优化结构

internal/data/payment/payment.go

@@ -14,18 +14,17 @@ import (
 	"strings"
 	"time"
 
-	datapayment "kra/internal/integration/payment"
-
 	"github.com/google/uuid"
 )
 
 type paymentRepo struct {
-	data   Provider
-	config integrationbiz.PaymentConfigReader
+	data    Provider
+	config  integrationbiz.PaymentConfigReader
+	factory bizpayment.PaymentAdapterFactory
 }
 
-func NewPaymentRepo(data Provider, config integrationbiz.PaymentConfigReader) bizpayment.PaymentRepo {
-	return &paymentRepo{data: data, config: config}
+func NewPaymentRepo(data Provider, config integrationbiz.PaymentConfigReader, factory bizpayment.PaymentAdapterFactory) bizpayment.PaymentRepo {
+	return &paymentRepo{data: data, config: config, factory: factory}
 }
 
 func (r *paymentRepo) values(ctx context.Context, provider string) (map[string]any, error) {
@@ -49,12 +48,15 @@ func (r *paymentRepo) values(ctx context.Context, provider string) (map[string]a
 	return values, nil
 }
 
-func (r *paymentRepo) adapter(ctx context.Context, provider string) (datapayment.Adapter, map[string]any, error) {
+func (r *paymentRepo) adapter(ctx context.Context, provider string) (bizpayment.PaymentAdapter, map[string]any, error) {
 	values, err := r.values(ctx, provider)
 	if err != nil {
 		return nil, nil, err
 	}
-	adapter, err := datapayment.New(provider)
+	if r.factory == nil {
+		return nil, nil, errors.New("支付渠道适配器未接入")
+	}
+	adapter, err := r.factory.New(provider)
 	return adapter, values, err
 }
 
@@ -81,7 +83,13 @@ func (r *paymentRepo) TestProvider(ctx context.Context, provider string) (*bizpa
 		return test, err
 	}
 
-	adapter, err := datapayment.New(provider)
+	if r.factory == nil {
+		err = errors.New("支付渠道适配器未接入")
+	}
+	var adapter bizpayment.PaymentAdapter
+	if err == nil {
+		adapter, err = r.factory.New(provider)
+	}
 	if err != nil {
 		add("adapter", "failed", err.Error(), "", time.Now())
 		return test, err
@@ -237,7 +245,7 @@ func validatePaymentTestResult(provider, tradeNo string, result *bizpayment.Paym
 	return nil
 }
 
-func queryPaymentTest(ctx context.Context, adapter datapayment.Adapter, queryID string, values map[string]any) (*bizpayment.PaymentResult, error) {
+func queryPaymentTest(ctx context.Context, adapter bizpayment.PaymentAdapter, queryID string, values map[string]any) (*bizpayment.PaymentResult, error) {
 	var result *bizpayment.PaymentResult
 	var err error
 	for attempt := 0; attempt < 3; attempt++ {
@@ -547,7 +555,3 @@ func contains(values []string, value string) bool {
 	}
 	return false
 }
-
-func validatePaymentConfig(provider string, values map[string]any) error {
-	return integrationbiz.ValidateIntegrationConfig(integrationbiz.IntegrationKindPayment, provider, values)
-}

internal/data/payment/payment_config_test.go

@@ -23,7 +23,7 @@ func TestValidatePaymentConfigRequiresDouyinAppIDWhenEnabled(t *testing.T) {
 }
 
 func TestValidatePaymentConfigAcceptsProviderAliases(t *testing.T) {
-	err := validatePaymentConfig(bizpayment.PaymentDouyin, map[string]any{
+	err := integrationbiz.ValidateIntegrationConfig(integrationbiz.IntegrationKindPayment, bizpayment.PaymentDouyin, map[string]any{
 		"app_id": "douyin-app", "merchant_id": "merchant-douyin", "serial_no": "merchant-serial", "api_key": "01234567890123456789012345678901",
 		"private_key": "merchant-private-key", "platform_cert": "platform-public-key", "platform_cert_serial": "platform-serial",
 	})

internal/data/payment/payment_helpers.go

@@ -1,17 +1,17 @@
 package payment
 
-import "kra/pkg/paymentkit"
+import "kra/internal/paymentkit"
 
 func text(values map[string]any, key string) string {
-	return paymentutil.Text(values, key)
+	return paymentkit.Text(values, key)
 }
 
 func firstAny(values map[string]any, keys ...string) string {
-	return paymentutil.FirstText(values, keys...)
+	return paymentkit.FirstText(values, keys...)
 }
 
 // configuredInt64 keeps repository-side validation independent from the
 // provider adapter package while sharing the canonical payment parser.
 func configuredInt64(values map[string]any, key string, fallback int64) int64 {
-	return paymentutil.ConfiguredInt64(values, key, fallback)
+	return paymentkit.ConfiguredInt64(values, key, fallback)
 }

internal/data/payment/payment_native_test.go

@@ -23,7 +23,7 @@ func TestPaymentDefinitionsProvideNonEmptyDefaults(t *testing.T) {
 }
 
 func TestPaymentValidationRejectsUnknownProvider(t *testing.T) {
-	err := validatePaymentConfig("unknown-provider", map[string]any{})
+	err := integrationbiz.ValidateIntegrationConfig(integrationbiz.IntegrationKindPayment, "unknown-provider", map[string]any{})
 	if err == nil || !strings.Contains(err.Error(), "不支持") {
 		t.Fatalf("error = %v", err)
 	}