1

server/styleagent/controller/payment_order_controller.go

@@ -2,7 +2,6 @@ package controller
 
 import (
 	"context"
-	"errors"
 	"fmt"
 
 	commonHttp "slogan-agent/common"
@@ -10,65 +9,32 @@ import (
 	"slogan-agent/styleagent/service"
 
 	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/net/ghttp"
 )
 
 // OrderCreate 下单 → 返回支付 URL
 func (c *member) OrderCreate(ctx context.Context, req *dto.MemberOrderCreateReq) (res *dto.MemberOrderCreateRes, err error) {
-	order, payURL, err := service.PaymentOrderService.CreateMemberOrder(ctx, commonHttp.GetUserId(g.RequestFromCtx(ctx)), req.PlanId)
-	if err != nil {
-		return nil, err
-	}
-	return &dto.MemberOrderCreateRes{OrderNo: order.OrderNo, PayUrl: payURL}, nil
+	return service.PaymentOrderService.CreateMemberOrder(ctx, commonHttp.GetUserId(g.RequestFromCtx(ctx)), req.PlanId)
 }
 
 // OrderStatus 订单状态（App 轮询）
 func (c *member) OrderStatus(ctx context.Context, req *dto.MemberOrderStatusReq) (res *dto.MemberOrderStatusRes, err error) {
-	order, err := service.PaymentOrderService.OrderStatus(ctx, req.OrderNo)
-	if err != nil || order == nil {
-		return nil, errors.New("订单不存在")
-	}
-	paidAt := ""
-	if order.PaidAt != nil {
-		paidAt = order.PaidAt.Format("Y-m-d H:i:s")
-	}
-	return &dto.MemberOrderStatusRes{Status: order.Status, TradeNo: order.TradeNo, PaidAt: paidAt}, nil
+	return service.PaymentOrderService.OrderStatus(ctx, req.OrderNo)
 }
 
-// MemberNotify 虎皮棋支付回调：验签 → 幂等开通 → 返回裸文本 "success"
-// 虎皮棋要求回调响应体为字面 "success"，故不走统一 JSON 包装（main.go 手动绑定）
-func MemberNotify(r *ghttp.Request) {
-	ctx := r.Context()
+// Notify 虎皮棋支付回调：验签/幂等开通在 service，此处仅做 HTTP 协议职责——读取回调参数、
+// 直接写裸文本响应体（虎皮棋要求字面 "success"，不走统一 JSON 包装，属"直接写响应体"例外）
+func (c *member) Notify(ctx context.Context, req *dto.MemberNotifyReq) (res *dto.MemberNotifyRes, err error) {
+	r := g.RequestFromCtx(ctx)
 	body := r.GetBodyString()
-	hash := r.Get("hash").String()
-	orderNo := r.Get("trade_order_id").String()
 	remoteIP := r.GetClientIp()
 
 	params := make(map[string]string)
 	for k, v := range r.GetRequestMap() {
 		params[k] = fmt.Sprint(v)
 	}
-	ok := service.PaymentOrderService.VerifyNotify(params, hash, g.Cfg().MustGet(ctx, "payment.xunhu_appsecret", "").String())
+	text := service.PaymentOrderService.HandleNotify(ctx, params, body, remoteIP)
 
-	if !ok {
-		if err := service.PayNotifyLogService.Insert(ctx, orderNo, body, hash, remoteIP, "bad_sign"); err != nil {
-			g.Log().Warningf(ctx, "写入支付回调日志失败（bad_sign）: %v", err)
-		}
-		r.Response.Write("fail")
-		r.ExitAll()
-		return
-	}
-
-	state, err := service.PaymentOrderService.HandlePaidNotify(ctx, orderNo, r.Get("transaction_id").String(), body)
-	if logErr := service.PayNotifyLogService.Insert(ctx, orderNo, body, hash, remoteIP, state); logErr != nil {
-		g.Log().Warningf(ctx, "写入支付回调日志失败: %v", logErr)
-	}
-	// duplicate（幂等重复回调）同样返回 success，避免支付渠道无限重试
-	if err != nil || state == "no_order" {
-		r.Response.Write("fail")
-		r.ExitAll()
-		return
-	}
-	r.Response.Write("success")
+	r.Response.Write(text)
 	r.ExitAll()
+	return nil, nil
 }