feat: 通用授权后台、离线证、Waffo 支付页与仪表盘加强
支持多产品计划展示、LICOFF 离线签发、支付独立配置与调试，以及分析看板；同步更新 README 与集成文档。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Logan.LiandCursor committed
1 parent
0966375076
commit
8cc2c83f9d
41 files changed
+3177
-332
No files matched your search
@@ -310,15 +310,16 @@ func renderSimplePage(title, headline, body, extraHTML, deepLink string) string
|
||||
</html>`
|
||||
}
|
||||
|
||||
// WaffoWebhook accepts loosely-shaped Waffo payment events and maps to PaymentWebhook. // Logan.Li
|
||||
// WaffoWebhook maps official Waffo Raw JSON webhooks (order.completed etc.) to PaymentWebhook.
|
||||
// Prefer data.orderMerchantExternalId (= our ORD-*) for matching; also accept legacy shapes. // Logan.Li
|
||||
func (ctrl *OrderController) WaffoWebhook(c *gin.Context) {
|
||||
body, err := io.ReadAll(c.Request.Body)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"code": 400, "message": "无法读取请求体"})
|
||||
return
|
||||
}
|
||||
// Optional: accept X-Waffo-Signature if present (no strict verification yet). // Logan.Li
|
||||
_ = c.GetHeader("X-Waffo-Signature")
|
||||
sigHeader := c.GetHeader("X-Waffo-Signature")
|
||||
_ = sigHeader // optional RSA verify when WAFFO_WEBHOOK_PUBLIC_KEY is set later // Logan.Li
|
||||
|
||||
var payload map[string]interface{}
|
||||
if len(body) > 0 {
|
||||
@@ -330,79 +331,93 @@ func (ctrl *OrderController) WaffoWebhook(c *gin.Context) {
|
||||
payload = map[string]interface{}{}
|
||||
}
|
||||
|
||||
orderNo := firstNonEmpty(
|
||||
data, _ := payload["data"].(map[string]interface{})
|
||||
metaTop, _ := payload["metadata"].(map[string]interface{})
|
||||
metaOrder, _ := data["orderMetadata"].(map[string]interface{})
|
||||
metaLegacy, _ := data["metadata"].(map[string]interface{})
|
||||
|
||||
// Official: orderMerchantExternalId is our ORD-*; orderId is Waffo ORD_*. // Logan.Li
|
||||
merchantExternalID := firstNonEmpty(
|
||||
asString(data["orderMerchantExternalId"]),
|
||||
asString(payload["orderMerchantExternalId"]),
|
||||
asString(metaOrder["orderNo"]),
|
||||
asString(metaOrder["order_no"]),
|
||||
asString(metaLegacy["orderNo"]),
|
||||
asString(metaLegacy["order_no"]),
|
||||
asString(metaTop["orderNo"]),
|
||||
asString(metaTop["order_no"]),
|
||||
asString(payload["order_no"]),
|
||||
asString(payload["orderNo"]),
|
||||
asString(payload["order_id"]),
|
||||
c.Query("order_no"),
|
||||
c.Query("orderNo"),
|
||||
)
|
||||
if orderNo == "" {
|
||||
if meta, ok := payload["metadata"].(map[string]interface{}); ok {
|
||||
orderNo = firstNonEmpty(asString(meta["orderNo"]), asString(meta["order_no"]))
|
||||
}
|
||||
}
|
||||
if orderNo == "" {
|
||||
if data, ok := payload["data"].(map[string]interface{}); ok {
|
||||
orderNo = firstNonEmpty(asString(data["order_no"]), asString(data["orderNo"]))
|
||||
if orderNo == "" {
|
||||
if meta, ok := data["metadata"].(map[string]interface{}); ok {
|
||||
orderNo = firstNonEmpty(asString(meta["orderNo"]), asString(meta["order_no"]))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if orderNo == "" {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"code": 400, "message": "missing order_no"})
|
||||
return
|
||||
}
|
||||
gatewayOrderNo := firstNonEmpty(
|
||||
asString(data["orderId"]),
|
||||
asString(payload["orderId"]),
|
||||
asString(payload["gateway_order_no"]),
|
||||
asString(payload["gatewayOrderNo"]),
|
||||
asString(payload["id"]),
|
||||
)
|
||||
paymentID := firstNonEmpty(asString(data["paymentId"]), asString(payload["paymentId"]))
|
||||
buyerEmail := firstNonEmpty(asString(data["buyerEmail"]), asString(payload["buyerEmail"]), asString(payload["customer_email"]))
|
||||
|
||||
eventType := firstNonEmpty(
|
||||
asString(payload["event_type"]),
|
||||
c.GetHeader("X-Waffo-Event"),
|
||||
asString(payload["eventType"]),
|
||||
asString(payload["event_type"]),
|
||||
asString(payload["type"]),
|
||||
asString(payload["event"]),
|
||||
"payment",
|
||||
)
|
||||
statusRaw := strings.ToLower(firstNonEmpty(
|
||||
asString(data["orderStatus"]),
|
||||
asString(data["paymentStatus"]),
|
||||
asString(payload["status"]),
|
||||
asString(payload["payment_status"]),
|
||||
asString(payload["paymentStatus"]),
|
||||
))
|
||||
gatewayOrderNo := firstNonEmpty(
|
||||
asString(payload["gateway_order_no"]),
|
||||
asString(payload["gatewayOrderNo"]),
|
||||
asString(payload["transaction_id"]),
|
||||
asString(payload["transactionId"]),
|
||||
asString(payload["id"]),
|
||||
)
|
||||
|
||||
mappedStatus := "paid"
|
||||
switch {
|
||||
case strings.Contains(statusRaw, "fail"), strings.Contains(statusRaw, "cancel"),
|
||||
strings.Contains(eventType, "fail"), strings.Contains(eventType, "cancel"):
|
||||
mappedStatus = "failed"
|
||||
case strings.Contains(statusRaw, "refund"), strings.Contains(eventType, "refund"):
|
||||
case strings.Contains(strings.ToLower(eventType), "refund"), strings.Contains(statusRaw, "refund"):
|
||||
mappedStatus = "refunded"
|
||||
case statusRaw == "" || strings.Contains(statusRaw, "paid") || strings.Contains(statusRaw, "complete") ||
|
||||
strings.Contains(statusRaw, "success") || strings.Contains(eventType, "complete") ||
|
||||
strings.Contains(eventType, "paid") || strings.Contains(eventType, "success"):
|
||||
case strings.Contains(strings.ToLower(eventType), "fail"), strings.Contains(strings.ToLower(eventType), "cancel"),
|
||||
strings.Contains(statusRaw, "fail"), strings.Contains(statusRaw, "cancel"):
|
||||
mappedStatus = "failed"
|
||||
case strings.Contains(strings.ToLower(eventType), "order.completed"),
|
||||
strings.Contains(strings.ToLower(eventType), "payment.succeeded"),
|
||||
statusRaw == "" || strings.Contains(statusRaw, "paid") || strings.Contains(statusRaw, "complete") ||
|
||||
strings.Contains(statusRaw, "success") || strings.Contains(statusRaw, "succeed"):
|
||||
mappedStatus = "paid"
|
||||
default:
|
||||
// Treat unknown completed-like events as paid for now. // Logan.Li
|
||||
mappedStatus = "paid"
|
||||
}
|
||||
|
||||
// Ignore non-terminal noise if event is clearly not a completion (e.g. order.created). // Logan.Li
|
||||
et := strings.ToLower(eventType)
|
||||
if strings.Contains(et, "order.created") || strings.Contains(et, "order.pending") ||
|
||||
strings.Contains(et, "payment.pending") || strings.Contains(et, "checkout.session") {
|
||||
c.JSON(http.StatusOK, gin.H{"code": 0, "message": "ignored event"})
|
||||
return
|
||||
}
|
||||
|
||||
if merchantExternalID == "" && gatewayOrderNo == "" && buyerEmail == "" {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"code": 400, "message": "missing orderMerchantExternalId / orderId"})
|
||||
return
|
||||
}
|
||||
|
||||
req := dto.PaymentWebhookRequest{
|
||||
EventType: eventType,
|
||||
OrderNo: orderNo,
|
||||
GatewayOrderNo: gatewayOrderNo,
|
||||
OrderNo: merchantExternalID,
|
||||
GatewayOrderNo: firstNonEmpty(gatewayOrderNo, paymentID),
|
||||
Status: mappedStatus,
|
||||
CustomerEmail: buyerEmail,
|
||||
Gateway: "waffo",
|
||||
Payload: string(body),
|
||||
Signature: c.GetHeader("X-Waffo-Signature"),
|
||||
Signature: sigHeader,
|
||||
}
|
||||
if err := ctrl.svc.PaymentWebhook(req, utils.GetClientIP(c)); err != nil {
|
||||
// Still 200 so Waffo does not retry forever on business errors; log via message. // Logan.Li
|
||||
c.JSON(http.StatusOK, gin.H{"code": 1, "message": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user