Просмотр исходного кода

refactor: improve webhook request_id regex parsing and support string-based order IDs

jerry 1 месяц назад
Родитель
Сommit
66552e3cbe
1 измененных файлов с 21 добавлено и 14 удалено
  1. 21 14
      app/services/webhook_service.py

+ 21 - 14
app/services/webhook_service.py

@@ -410,29 +410,35 @@ class WebhookService:
         payment_id = metadata.get("payment_id")
         order_id = metadata.get("order_id")
 
-        # 尝试从 request_id (例如 order_123_pay_456) 解析
+        # 尝试从 request_id (例如 order_ORD-20261002171915-72dbce84_pay_123) 解析
         if not payment_id or not order_id:
             request_id = obj.get("request_id", "")
-            if request_id.startswith("order_") and "_pay_" in request_id:
-                parts = request_id.split("_")
-                try:
-                    order_id = parts[1]
-                    payment_id = parts[3]
-                except Exception:
-                    pass
+            if request_id:
+                m = re.match(r"^order_(.+)_pay_(\d+)$", request_id)
+                if m:
+                    order_id = m.group(1)
+                    payment_id = m.group(2)
 
         if not payment_id or not order_id:
             logger.error(f"❌ [WEBHOOK] Missing payment_id or order_id in Creem metadata for event {event_id}")
             raise BizLogicError("Missing payment_id or order_id in metadata")
 
-        pay_stmt = select(VasPayment).where(VasPayment.id == int(payment_id))
+        try:
+            pay_id = int(payment_id)
+        except (ValueError, TypeError):
+            logger.error(f"❌ [WEBHOOK] Invalid payment_id in Creem metadata: {payment_id}")
+            raise BizLogicError(f"Invalid payment_id: {payment_id}")
+
+        pay_stmt = select(VasPayment).where(VasPayment.id == pay_id)
         pay_result = await db.execute(pay_stmt)
         payment = pay_result.scalar_one_or_none()
 
         if not payment:
-            logger.error(f"❌ [WEBHOOK] Creem payment {payment_id} not found")
+            logger.error(f"❌ [WEBHOOK] Creem payment {pay_id} not found")
             raise NotFoundError("Payment not found")
 
+        str_order_id = str(order_id)
+
         if payment.status == "succeeded":
             db.add(
                 VasPaymentEvent(
@@ -440,13 +446,14 @@ class WebhookService:
                     event_id=event_id,
                     event_type=event_type,
                     matched_payment_id=payment.id,
+                    matched_order_id=str_order_id,
                     raw_payload=event,
                     status="duplicate",
                     created_at=datetime.utcnow(),
                 )
             )
             await db.commit()
-            logger.info(f"🔔 [WEBHOOK] Creem payment {payment_id} already succeeded (duplicate event)")
+            logger.info(f"🔔 [WEBHOOK] Creem payment {pay_id} already succeeded (duplicate event)")
             return None
 
         now = datetime.utcnow()
@@ -454,7 +461,7 @@ class WebhookService:
         payment.provider_payload = event
         payment.updated_at = now
 
-        order_stmt = select(VasOrder).where(VasOrder.id == int(order_id))
+        order_stmt = select(VasOrder).where(VasOrder.id == str_order_id)
         order_result = await db.execute(order_stmt)
         order = order_result.scalar_one_or_none()
 
@@ -470,7 +477,7 @@ class WebhookService:
                 event_id=event_id,
                 event_type=event_type,
                 matched_payment_id=payment.id,
-                matched_order_id=int(order_id),
+                matched_order_id=str_order_id,
                 raw_payload=event,
                 status="applied",
                 created_at=now,
@@ -480,7 +487,7 @@ class WebhookService:
         await db.commit()
         await db.refresh(payment)
 
-        logger.info(f"🎉 [WEBHOOK] Creem checkout completed: order={order_id} payment={payment.id} status={payment.status}")
+        logger.info(f"🎉 [WEBHOOK] Creem checkout completed: order={str_order_id} payment={payment.id} status={payment.status}")
 
         return PaymentWebhookOut(
             status=True,