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
+11 -1
View File
@@ -4,11 +4,16 @@ import (
"context"
"gorm.io/gorm"
"hfb_sys/backend/internal/model"
"hfb_sys/backend/internal/tenancy"
)
func (r *Repository) Query(ctx context.Context, userID uint64, orderID uint64) (*PaymentDTO, error) {
var payment model.PaymentOrder
if err := r.db.WithContext(ctx).Where("order_id = ? AND user_id = ? AND biz_type = ?", orderID, userID, "order_pay").Order("id DESC").First(&payment).Error; err != nil {
query := r.db.WithContext(ctx).Where("order_id = ? AND user_id = ? AND biz_type = ?", orderID, userID, "order_pay")
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
query = query.Where("tenant_id = ?", tenantID)
}
if err := query.Order("id DESC").First(&payment).Error; err != nil {
if err == gorm.ErrRecordNotFound {
return nil, ErrPaymentNotFound
}
@@ -48,6 +53,10 @@ func (r *Repository) AdminList(ctx context.Context, query AdminPaymentQuery) (*P
Select("p.*, COALESCE(u.phone, '') AS user_phone").
Joins("LEFT JOIN users AS u ON u.id = p.user_id")
countDB := r.db.WithContext(ctx).Model(&model.PaymentOrder{})
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
db = db.Where("p.tenant_id = ?", tenantID)
countDB = countDB.Where("tenant_id = ?", tenantID)
}
if query.UserID > 0 {
db = db.Where("p.user_id = ?", query.UserID)
countDB = countDB.Where("user_id = ?", query.UserID)
@@ -104,6 +113,7 @@ func (row adminPaymentRow) toDTO() AdminPaymentDTO {
errorCode, errorMessage := paymentErrorSummary(row.Status, row.RawResponse)
return AdminPaymentDTO{
ID: row.ID,
TenantID: row.TenantID,
PaymentNo: row.PaymentNo,
OrderID: row.OrderID,
OrderNo: row.OrderNo,