feat(tenant): 按租户隔离支付退款与商户配置

This commit is contained in:
yml
2026-11-15 16:06:30 +08:00
parent 6d2affa15f
commit c7dacfa025
33 changed files with 767 additions and 233 deletions
+22 -9
View File
@@ -8,6 +8,7 @@ import (
"hfb_sys/backend/internal/model"
"hfb_sys/backend/internal/modules/order"
"hfb_sys/backend/internal/modules/paymentconfig"
"hfb_sys/backend/internal/tenancy"
"go.uber.org/zap"
"gorm.io/gorm"
@@ -176,8 +177,9 @@ func (c runtimePaymentConfig) isMockMode() bool {
}
// resolveOrderRuntimeConfig 根据订单所属分销站点配置或全局默认配置解析运行时支付配置。
func (r *Repository) resolveOrderRuntimeConfig(ctx context.Context, tx *gorm.DB, siteID *uint64, payWay string) (*runtimePaymentConfig, error) {
if siteID != nil && *siteID > 0 {
func (r *Repository) resolveOrderRuntimeConfig(ctx context.Context, tx *gorm.DB, tenantID uint64, siteID *uint64, payWay string) (*runtimePaymentConfig, error) {
configCtx := scopedTenantContext(ctx, tenantID)
if tenantID == 0 && siteID != nil && *siteID > 0 {
var configID uint64
queryDB := tx
if queryDB == nil {
@@ -190,13 +192,13 @@ func (r *Repository) resolveOrderRuntimeConfig(ctx context.Context, tx *gorm.DB,
Limit(1).
Pluck("pmc.id", &configID).Error
if err == nil && configID > 0 && r.configRepo != nil {
dto, err := r.configRepo.FindRuntimeByID(ctx, configID, true)
dto, err := r.configRepo.FindRuntimeByID(configCtx, configID, true)
if err == nil {
return runtimeConfigFromDTO(dto), nil
}
}
}
return r.defaultRuntimeConfig(ctx, payWay)
return r.defaultRuntimeConfig(configCtx, payWay)
}
// defaultRuntimeConfig 按支付方式获取默认启用配置,用于新支付单创建。
@@ -213,11 +215,12 @@ func (r *Repository) defaultRuntimeConfig(ctx context.Context, payWay string) (*
// runtimeConfigForPayment 回溯支付单当时命中的配置,优先使用 payment_config_id。
func (r *Repository) runtimeConfigForPayment(ctx context.Context, payment *model.PaymentOrder) (*runtimePaymentConfig, error) {
configCtx := scopedTenantContext(ctx, payment.TenantID)
provider := firstNonEmpty(payment.Provider, "mock")
merchantID := payment.MerchantID
payWay := normalizePayWay(payment.PayWay)
if r.configRepo != nil && payment.PaymentConfigID > 0 {
dto, err := r.configRepo.FindRuntimeByID(ctx, payment.PaymentConfigID, true)
dto, err := r.configRepo.FindRuntimeByID(configCtx, payment.PaymentConfigID, true)
if err == nil {
return runtimeConfigFromDTO(dto), nil
}
@@ -226,14 +229,14 @@ func (r *Repository) runtimeConfigForPayment(ctx context.Context, payment *model
}
}
if r.configRepo != nil && merchantID != "" {
dto, err := r.configRepo.FindByProviderMerchantPayWay(ctx, provider, merchantID, payWay, true)
dto, err := r.configRepo.FindByProviderMerchantPayWay(configCtx, provider, merchantID, payWay, true)
if err == nil {
return runtimeConfigFromDTO(dto), nil
}
if err != paymentconfig.ErrConfigNotFound {
return nil, err
}
dto, err = r.configRepo.FindByProviderMerchant(ctx, provider, merchantID, true)
dto, err = r.configRepo.FindByProviderMerchant(configCtx, provider, merchantID, true)
if err == nil {
return runtimeConfigFromDTO(dto), nil
}
@@ -253,10 +256,13 @@ func (r *Repository) runtimeConfigForPayment(ctx context.Context, payment *model
MerchantID: merchantID,
}, nil
}
if payment.TenantID > 0 {
return nil, ErrPaymentUnavailable
}
if r.configRepo == nil {
return nil, ErrPaymentUnavailable
}
dto, err := r.configRepo.FindDefaultByProviderPayWay(ctx, provider, payWay, true)
dto, err := r.configRepo.FindDefaultByProviderPayWay(configCtx, provider, payWay, true)
if err != nil {
return nil, err
}
@@ -292,7 +298,7 @@ func (r *Repository) recordConfigUsage(ctx context.Context, runtimeConfig *runti
if (payment.BizType != "order_pay" && payment.BizType != "mohong_pay") || payment.Status != "paid" {
return
}
if err := r.configRepo.RecordUsage(ctx, runtimeConfig.ID, payment.ID, runtimeConfig.Provider, runtimeConfig.MerchantID, payment.AmountCent, payment.BizType); err != nil {
if err := r.configRepo.RecordUsage(ctx, payment.TenantID, runtimeConfig.ID, payment.ID, runtimeConfig.Provider, runtimeConfig.MerchantID, payment.AmountCent, payment.BizType); err != nil {
r.log().Warn("支付配置使用记录保存失败", paymentLogFields(ctx,
zap.Uint64("payment_config_id", runtimeConfig.ID),
zap.Uint64("payment_id", payment.ID),
@@ -300,3 +306,10 @@ func (r *Repository) recordConfigUsage(ctx context.Context, runtimeConfig *runti
)...)
}
}
func scopedTenantContext(ctx context.Context, tenantID uint64) context.Context {
if tenantID == 0 || tenancy.IDFromContext(ctx) == tenantID {
return ctx
}
return tenancy.WithScope(ctx, tenancy.Scope{TenantID: tenantID})
}