fix(order): 支持客服跨站处理订单与退款

This commit is contained in:
yml
2026-11-19 20:29:16 +08:00
parent 3492ecbe9b
commit cd081d1cdd
18 changed files with 349 additions and 191 deletions
+25
View File
@@ -106,3 +106,28 @@ type AdminPaymentDTO struct {
CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"`
}
// AdminOrderPaymentDTO 只暴露订单详情处理退款所需的最小支付信息。
type AdminOrderPaymentDTO struct {
ID uint64 `json:"id"`
TenantID uint64 `json:"tenant_id"`
PaymentNo string `json:"payment_no"`
OrderID uint64 `json:"order_id"`
OrderNo string `json:"order_no"`
UserID uint64 `json:"user_id"`
UserPhone string `json:"user_phone"`
Provider string `json:"provider"`
MerchantID string `json:"merchant_id"`
ThirdOrderID string `json:"third_order_id"`
ProviderOrderID string `json:"provider_order_id"`
PayWay string `json:"pay_way"`
AmountCent int64 `json:"amount_cent"`
BizType string `json:"biz_type"`
Status string `json:"status"`
ErrorCode string `json:"error_code"`
ErrorMessage string `json:"error_message"`
PaidAt *time.Time `json:"paid_at,omitempty"`
NotifiedAt *time.Time `json:"notified_at,omitempty"`
CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"`
}
@@ -222,6 +222,19 @@ func (h *Handler) AdminList(c *gin.Context) {
response.OK(c, result)
}
func (h *Handler) AdminOrderPayments(c *gin.Context) {
orderID, ok := parseID(c)
if !ok {
return
}
items, err := h.service.OrderPayments(c.Request.Context(), orderID)
if err != nil {
writePaymentError(c, err)
return
}
response.OK(c, gin.H{"items": items})
}
func (h *Handler) LeshuaNotify(c *gin.Context) {
body, err := io.ReadAll(io.LimitReader(c.Request.Body, 1<<20))
if err != nil {
@@ -0,0 +1,93 @@
package payment
import (
"context"
"hfb_sys/backend/internal/model"
"hfb_sys/backend/internal/tenancy"
"gorm.io/gorm"
)
// OrderPayments 返回指定订单在原付款租户下的支付与退款流水。
// 调用方必须先通过订单访问校验,避免把普通支付列表接口开放给客服。
func (r *Repository) OrderPayments(ctx context.Context, orderID uint64) ([]AdminOrderPaymentDTO, error) {
if r == nil || r.db == nil {
return nil, ErrDependencyUnavailable
}
var order struct {
BuyerTenantID uint64
SourceTenantID uint64
PaymentTenantID uint64
DistributionSiteID *uint64
}
if err := r.db.WithContext(ctx).
Model(&model.RentalOrder{}).
Select("buyer_tenant_id, source_tenant_id, payment_tenant_id, distribution_site_id").
Where("id = ?", orderID).
Take(&order).Error; err != nil {
if err == gorm.ErrRecordNotFound {
return nil, ErrPaymentNotFound
}
return nil, err
}
tenantID := tenancy.IDFromContext(ctx)
if tenantID > 0 && order.BuyerTenantID != tenantID && order.SourceTenantID != tenantID {
return nil, ErrPaymentNotFound
}
if order.DistributionSiteID != nil && *order.DistributionSiteID > 0 {
return nil, ErrPaymentNotFound
}
paymentTenantID := order.PaymentTenantID
if paymentTenantID == 0 {
paymentTenantID = order.BuyerTenantID
}
query := r.db.WithContext(ctx).
Table("payment_orders AS p").
Select("p.*, COALESCE(u.phone, '') AS user_phone").
Joins("LEFT JOIN users AS u ON u.id = p.user_id").
Where("p.order_id = ?", orderID)
if paymentTenantID > 0 {
query = query.Where("p.tenant_id = ?", paymentTenantID)
}
var rows []adminPaymentRow
if err := query.Order("p.id DESC").Scan(&rows).Error; err != nil {
return nil, err
}
items := make([]AdminOrderPaymentDTO, 0, len(rows))
for _, row := range rows {
items = append(items, row.toOrderDTO())
}
return items, nil
}
func (row adminPaymentRow) toOrderDTO() AdminOrderPaymentDTO {
errorCode, errorMessage := paymentErrorSummary(row.Status, row.RawResponse)
return AdminOrderPaymentDTO{
ID: row.ID,
TenantID: row.TenantID,
PaymentNo: row.PaymentNo,
OrderID: row.OrderID,
OrderNo: row.OrderNo,
UserID: row.UserID,
UserPhone: row.UserPhone,
Provider: row.Provider,
MerchantID: row.MerchantID,
ThirdOrderID: row.ThirdOrderID,
ProviderOrderID: row.ProviderOrderID,
PayWay: row.PayWay,
AmountCent: row.AmountCent,
BizType: row.BizType,
Status: row.Status,
ErrorCode: errorCode,
ErrorMessage: errorMessage,
PaidAt: row.PaidAt,
NotifiedAt: row.NotifiedAt,
CreatedAt: row.CreatedAt,
UpdatedAt: row.UpdatedAt,
}
}
+45 -3
View File
@@ -21,6 +21,7 @@ func (r *Repository) StartRefund(ctx context.Context, orderID uint64, refundAmou
if err != nil {
return nil, err
}
ctx = scopedTenantContext(ctx, originalPayment.TenantID)
runtimeConfig, err := r.runtimeConfigForPayment(ctx, &originalPayment)
if err != nil {
return nil, ErrPaymentUnavailable
@@ -165,6 +166,11 @@ func (r *Repository) StartRefund(ctx context.Context, orderID uint64, refundAmou
}
func (r *Repository) QueryRefundStatus(ctx context.Context, orderID uint64) (*RefundDTO, error) {
var payment model.PaymentOrder
tenantID, err := r.paymentTenantIDForOrder(ctx, orderID)
if err != nil {
return nil, err
}
ctx = scopedTenantContext(ctx, tenantID)
query := r.db.WithContext(ctx).Where("order_id = ? AND biz_type IN ?", orderID, refundBizTypes)
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
query = query.Where("tenant_id = ?", tenantID)
@@ -201,9 +207,39 @@ func (r *Repository) SyncRefundStatusByPaymentID(ctx context.Context, paymentID
return &dto, nil
}
func (r *Repository) findOriginalPayment(ctx context.Context, orderID uint64) (model.PaymentOrder, error) {
tenantID, err := r.paymentTenantIDForOrder(ctx, orderID)
if err != nil {
return model.PaymentOrder{}, err
}
return r.findOriginalPaymentInTenant(ctx, orderID, tenantID)
}
func (r *Repository) paymentTenantIDForOrder(ctx context.Context, orderID uint64) (uint64, error) {
var order struct {
BuyerTenantID uint64
PaymentTenantID uint64
}
if err := r.db.WithContext(ctx).
Model(&model.RentalOrder{}).
Select("buyer_tenant_id, payment_tenant_id").
Where("id = ?", orderID).
Take(&order).Error; err != nil {
if err == gorm.ErrRecordNotFound {
return 0, ErrPaymentNotFound
}
return 0, err
}
if order.PaymentTenantID > 0 {
return order.PaymentTenantID, nil
}
return order.BuyerTenantID, nil
}
func (r *Repository) findOriginalPaymentInTenant(ctx context.Context, orderID uint64, tenantID uint64) (model.PaymentOrder, error) {
var originalPayment model.PaymentOrder
query := r.db.WithContext(ctx).Where("order_id = ? AND status = 'paid' AND biz_type = 'order_pay'", orderID)
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
query := r.db.WithContext(scopedTenantContext(ctx, tenantID)).
Where("order_id = ? AND status = 'paid' AND biz_type = 'order_pay'", orderID)
if tenantID > 0 {
query = query.Where("tenant_id = ?", tenantID)
}
if err := query.Order("id DESC").First(&originalPayment).Error; err != nil {
@@ -400,10 +436,16 @@ func refundQueryRequest(payment model.PaymentOrder, originalPayment model.Paymen
}
func (r *Repository) findOriginalPaymentForRefund(ctx context.Context, payment *model.PaymentOrder) (model.PaymentOrder, error) {
if payment != nil {
ctx = scopedTenantContext(ctx, payment.TenantID)
}
if payment != nil && isMohongRefundBizType(payment.BizType) {
return r.findOriginalMohongPayment(ctx, payment.OrderID)
}
return r.findOriginalPayment(ctx, payment.OrderID)
if payment == nil {
return model.PaymentOrder{}, ErrPaymentNotFound
}
return r.findOriginalPaymentInTenant(ctx, payment.OrderID, payment.TenantID)
}
func (r *Repository) updateRefundedOrderStatus(ctx context.Context, orderID uint64, refundAmountCent int64, bizType string) error {
@@ -141,3 +141,13 @@ func (s *Service) AdminList(ctx context.Context, query AdminPaymentQuery) (*Pagi
}
return s.repo.AdminList(ctx, query)
}
func (s *Service) OrderPayments(ctx context.Context, orderID uint64) ([]AdminOrderPaymentDTO, error) {
if s.repo == nil {
return nil, ErrDependencyUnavailable
}
if orderID == 0 {
return nil, ErrPaymentNotFound
}
return s.repo.OrderPayments(ctx, orderID)
}
@@ -117,3 +117,45 @@ func TestTenantOrderWithoutOwnConfigDoesNotUseOtherTenantDefault(t *testing.T) {
t.Fatalf("missing tenant config error = %v", err)
}
}
func TestRefundAndOrderPaymentsUsePaymentTenant(t *testing.T) {
db := database.NewTestDB()
order := model.RentalOrder{
BuyerTenantID: 202, SourceTenantID: 101, PaymentTenantID: 202,
OrderNo: "RO-CROSS-SITE-REFUND", RenterID: 1,
RentAmountCent: 1000, DepositAmountCent: 500, Status: "renting",
}
if err := db.Create(&order).Error; err != nil {
t.Fatal(err)
}
payment := model.PaymentOrder{
TenantID: 202, PaymentNo: "PAY-CROSS-SITE-REFUND", OrderID: order.ID,
OrderNo: order.OrderNo, UserID: order.RenterID, Provider: "mock",
ThirdOrderID: "PAY-CROSS-SITE-REFUND", PayWay: "ZFBZF",
AmountCent: 1500, BizType: "order_pay", Status: "paid",
}
if err := db.Create(&payment).Error; err != nil {
t.Fatal(err)
}
repo := NewRepository(db, nil, nil)
original, err := repo.findOriginalPayment(paymentTenantContext(101), order.ID)
if err != nil {
t.Fatalf("find original payment from source tenant: %v", err)
}
if original.ID != payment.ID || original.TenantID != 202 {
t.Fatalf("original payment = %+v", original)
}
items, err := repo.OrderPayments(paymentTenantContext(101), order.ID)
if err != nil {
t.Fatalf("load order payments from source tenant: %v", err)
}
if len(items) != 1 || items[0].ID != payment.ID || items[0].TenantID != 202 {
t.Fatalf("order payments = %+v", items)
}
if _, err := repo.OrderPayments(paymentTenantContext(303), order.ID); !errors.Is(err, ErrPaymentNotFound) {
t.Fatalf("unrelated tenant payment access error = %v", err)
}
}