oadmin/sub2api
1
0
Fork 0
Code Issues Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

fix: tighten payment legacy fallback paths

Browse Source
This commit is contained in:
IanShaw027
2026-04-21 13:03:53 +08:00
parent 276ce052a3
commit 64e401e224
4 changed files with 111 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
backend/internal/service/payment_fulfillment.go
View File

@@ -25,9 +25,9 @@ func (s *PaymentService) HandlePaymentNotification(ctx context.Context, n *payme
// Look up order by out_trade_no (the external order ID we sent to the provider)
order, err := s.entClient.PaymentOrder.Query().Where(paymentorder.OutTradeNo(n.OrderID)).Only(ctx)
if err != nil {
// Fallback: try legacy format (sub2_N where N is DB ID)
trimmed := strings.TrimPrefix(n.OrderID, orderIDPrefix)
if oid, parseErr := strconv.ParseInt(trimmed, 10, 64); parseErr == nil {
// Fallback only for true legacy "sub2_N" DB-ID payloads when the
// current out_trade_no lookup genuinely did not find an order.
if oid, ok := parseLegacyPaymentOrderID(n.OrderID, err); ok {
return s.confirmPayment(ctx, oid, n.TradeNo, n.Amount, pk, n.Metadata)
}
return fmt.Errorf("order not found for out_trade_no: %s", n.OrderID)
@@ -35,6 +35,25 @@ func (s *PaymentService) HandlePaymentNotification(ctx context.Context, n *payme
return s.confirmPayment(ctx, order.ID, n.TradeNo, n.Amount, pk, n.Metadata)
}
func parseLegacyPaymentOrderID(orderID string, lookupErr error) (int64, bool) {
if !dbent.IsNotFound(lookupErr) {
return 0, false
}
orderID = strings.TrimSpace(orderID)
if !strings.HasPrefix(orderID, orderIDPrefix) {
return 0, false
}
trimmed := strings.TrimPrefix(orderID, orderIDPrefix)
if trimmed == "" || trimmed == orderID {
return 0, false
}
oid, err := strconv.ParseInt(trimmed, 10, 64)
if err != nil || oid <= 0 {
return 0, false
}
return oid, true
}
func (s *PaymentService) confirmPayment(ctx context.Context, oid int64, tradeNo string, paid float64, pk string, metadata map[string]string) error {
o, err := s.entClient.PaymentOrder.Get(ctx, oid)
if err != nil {