优化支付日志和配置删除提示

backend/internal/modules/payment/repository.go

@@ -2,18 +2,22 @@ package payment
 
 import (
 	"context"
-	"log"
+	"sort"
 
-	"gorm.io/gorm"
+	"hfb_sys/backend/internal/logging"
 	"hfb_sys/backend/internal/model"
 	"hfb_sys/backend/internal/modules/order"
 	"hfb_sys/backend/internal/modules/paymentconfig"
+
+	"go.uber.org/zap"
+	"gorm.io/gorm"
 )
 
 type Repository struct {
 	db         *gorm.DB
 	configRepo *paymentconfig.Repository
 	orderRepo  *order.Repository
+	logger     *zap.Logger
 }
 
 type runtimePaymentConfig struct {
@@ -51,12 +55,91 @@ func RefundBizTypes() []string {
 }
 
 // NewRepository 创建支付仓库，注入支付配置仓库和订单仓库。
-func NewRepository(db *gorm.DB, configRepo *paymentconfig.Repository, orderRepo *order.Repository) *Repository {
-	return &Repository{
+func NewRepository(db *gorm.DB, configRepo *paymentconfig.Repository, orderRepo *order.Repository, options ...RepositoryOption) *Repository {
+	repo := &Repository{
 		db:         db,
 		configRepo: configRepo,
 		orderRepo:  orderRepo,
+		logger:     zap.NewNop(),
 	}
+	for _, option := range options {
+		option(repo)
+	}
+	if repo.logger == nil {
+		repo.logger = zap.NewNop()
+	}
+	return repo
+}
+
+type RepositoryOption func(*Repository)
+
+// WithLogger 为支付仓库注入结构化日志器。
+func WithLogger(logger *zap.Logger) RepositoryOption {
+	return func(repo *Repository) {
+		if logger != nil {
+			repo.logger = logger
+		}
+	}
+}
+
+func (r *Repository) log() *zap.Logger {
+	if r == nil || r.logger == nil {
+		return zap.NewNop()
+	}
+	return r.logger
+}
+
+func paymentLogFields(ctx context.Context, fields ...zap.Field) []zap.Field {
+	base := []zap.Field{zap.String("module", "payment")}
+	if requestID := logging.RequestIDFromContext(ctx); requestID != "" {
+		base = append(base, zap.String("request_id", requestID))
+	}
+	return append(base, fields...)
+}
+
+func runtimeConfigFields(runtimeConfig *runtimePaymentConfig) []zap.Field {
+	if runtimeConfig == nil {
+		return nil
+	}
+	return []zap.Field{
+		zap.Uint64("payment_config_id", runtimeConfig.ID),
+		zap.String("provider", runtimeConfig.Provider),
+		zap.String("merchant_id", runtimeConfig.MerchantID),
+		zap.String("pay_way", runtimeConfig.PayWay),
+	}
+}
+
+func paymentOrderFields(payment *model.PaymentOrder) []zap.Field {
+	if payment == nil {
+		return nil
+	}
+	return []zap.Field{
+		zap.Uint64("payment_id", payment.ID),
+		zap.Uint64("order_id", payment.OrderID),
+		zap.String("order_no", payment.OrderNo),
+		zap.String("third_order_id", payment.ThirdOrderID),
+		zap.String("provider_order_id", payment.ProviderOrderID),
+		zap.Int64("amount_cent", payment.AmountCent),
+		zap.String("biz_type", payment.BizType),
+		zap.String("status", payment.Status),
+	}
+}
+
+func appendFields(groups ...[]zap.Field) []zap.Field {
+	var out []zap.Field
+	for _, group := range groups {
+		out = append(out, group...)
+	}
+	return out
+}
+
+func stringMapKeys(value map[string]string) []string {
+	keys := make([]string, 0, len(value))
+	for key := range value {
+		keys = append(keys, key)
+	}
+	sort.Strings(keys)
+	return keys
 }
 
 // isMockMode 判断当前运行时配置是否为模拟支付。
@@ -158,6 +241,10 @@ func (r *Repository) recordConfigUsage(ctx context.Context, runtimeConfig *runti
 		return
 	}
 	if err := r.configRepo.RecordUsage(ctx, runtimeConfig.ID, payment.ID, runtimeConfig.Provider, runtimeConfig.MerchantID, payment.AmountCent, payment.BizType); err != nil {
-		log.Printf("[payment] record config usage failed config_id=%d payment_id=%d err=%v", runtimeConfig.ID, payment.ID, err)
+		r.log().Warn("payment config usage record failed", paymentLogFields(ctx,
+			zap.Uint64("payment_config_id", runtimeConfig.ID),
+			zap.Uint64("payment_id", payment.ID),
+			zap.Error(err),
+		)...)
 	}
 }