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
@@ -6,6 +6,7 @@ import (
"time"
"hfb_sys/backend/internal/model"
"hfb_sys/backend/internal/tenancy"
"hfb_sys/backend/internal/timeutil"
"go.uber.org/zap"
@@ -136,11 +137,16 @@ func (r *Repository) preparePayment(ctx context.Context, userID uint64, orderID
if row.Status != "pending_payment" {
return ErrPaymentCannotStart
}
requestTenantID := tenancy.IDFromContext(ctx)
paymentTenantID := orderPaymentTenantID(row)
if requestTenantID > 0 && paymentTenantID > 0 && requestTenantID != paymentTenantID {
return ErrPaymentCannotStart
}
amountCent := row.RentAmountCent + row.DepositAmountCent
if amountCent <= 0 {
return ErrPaymentCannotStart
}
runtimeConfig, err := r.resolveOrderRuntimeConfig(ctx, tx, row.DistributionSiteID, req.PayWay)
runtimeConfig, err := r.resolveOrderRuntimeConfig(ctx, tx, paymentTenantID, row.DistributionSiteID, req.PayWay)
if err != nil {
return err
}
@@ -154,6 +160,7 @@ func (r *Repository) preparePayment(ctx context.Context, userID uint64, orderID
existing.PayWay = firstNonEmpty(req.PayWay, existing.PayWay, runtimeConfig.PayWay, "ZFBZF")
existing.JSPayFlag = firstNonEmpty(req.JSPayFlag, existing.JSPayFlag, runtimeConfig.JSPayFlag, "2")
existing.AmountCent = amountCent
existing.TenantID = firstNonZero(existing.TenantID, paymentTenantID)
existing.PaymentConfigID = firstNonZero(existing.PaymentConfigID, runtimeConfig.ID)
existing.Provider = firstNonEmpty(existing.Provider, runtimeConfig.Provider)
existing.MerchantID = firstNonEmpty(existing.MerchantID, runtimeConfig.MerchantID)
@@ -240,6 +247,7 @@ func newOrderPayment(row model.RentalOrder, amountCent int64, req StartPaymentRe
return model.PaymentOrder{}, err
}
payment := model.PaymentOrder{
TenantID: orderPaymentTenantID(row),
PaymentNo: paymentNo,
OrderID: row.ID,
OrderNo: row.OrderNo,
@@ -261,3 +269,10 @@ func newOrderPayment(row model.RentalOrder, amountCent int64, req StartPaymentRe
}
return payment, nil
}
func orderPaymentTenantID(row model.RentalOrder) uint64 {
if row.PaymentTenantID > 0 {
return row.PaymentTenantID
}
return row.BuyerTenantID
}