yvan/kra-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化结构

Browse Source
This commit is contained in:
Yvan
2026-08-22 15:53:14 +08:00
parent ca52de5db0
commit 491ed21d48
72 changed files with 746 additions and 695 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/integration/payment/alipay.go
+25 -25
View File
@@ -7,7 +7,7 @@ import (
"errors"
"fmt"
"io"
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"net/http"
"net/url"
"sort"
@@ -38,7 +38,7 @@ type alipayResponseBody struct {
io.Closer
}
func (a *alipayAdapter) Create(ctx context.Context, req *system.PaymentRequest, c map[string]any) (*system.PaymentResult, error) {
func (a *alipayAdapter) Create(ctx context.Context, req *bizpayment.PaymentRequest, c map[string]any) (*bizpayment.PaymentResult, error) {
if req == nil {
return nil, errors.New("支付宝下单参数为空")
}
@@ -91,8 +91,8 @@ func (a *alipayAdapter) Create(ctx context.Context, req *system.PaymentRequest,
if status == "success" && strings.TrimSpace(response.TradeNo) == "" {
return nil, errors.New("支付宝付款码支付成功响应缺少 trade_no")
}
return &system.PaymentResult{
Provider: system.PaymentAlipay, Status: status, TradeNo: req.TradeNo,
return &bizpayment.PaymentResult{
Provider: bizpayment.PaymentAlipay, Status: status, TradeNo: req.TradeNo,
ProviderTradeNo: strings.TrimSpace(response.TradeNo), Payload: sdk.payload(rsp),
}, nil
case "alipay.trade.precreate":
@@ -112,8 +112,8 @@ func (a *alipayAdapter) Create(ctx context.Context, req *system.PaymentRequest,
}
// Precreate has no Alipay trade number yet. Keep the QR code in Payload
// and query later by the merchant out_trade_no.
return &system.PaymentResult{
Provider: system.PaymentAlipay, Status: "created", TradeNo: req.TradeNo,
return &bizpayment.PaymentResult{
Provider: bizpayment.PaymentAlipay, Status: "created", TradeNo: req.TradeNo,
QueryID: queryID, Payload: sdk.payload(rsp),
}, nil
case "alipay.trade.app.pay":
@@ -124,8 +124,8 @@ func (a *alipayAdapter) Create(ctx context.Context, req *system.PaymentRequest,
if strings.TrimSpace(orderString) == "" {
return nil, errors.New("支付宝 APP 支付参数为空")
}
return &system.PaymentResult{
Provider: system.PaymentAlipay, Status: "created", TradeNo: req.TradeNo,
return &bizpayment.PaymentResult{
Provider: bizpayment.PaymentAlipay, Status: "created", TradeNo: req.TradeNo,
Payload: mustMarshalAlipayPayload(map[string]string{"order_string": orderString}),
}, nil
case "alipay.trade.page.pay":
@@ -140,8 +140,8 @@ func (a *alipayAdapter) Create(ctx context.Context, req *system.PaymentRequest,
if err != nil {
return nil, err
}
return &system.PaymentResult{
Provider: system.PaymentAlipay, Status: "created", TradeNo: req.TradeNo,
return &bizpayment.PaymentResult{
Provider: bizpayment.PaymentAlipay, Status: "created", TradeNo: req.TradeNo,
Payload: mustMarshalAlipayPayload(map[string]string{"pay_url": payURL}),
}, nil
case "alipay.trade.wap.pay":
@@ -156,8 +156,8 @@ func (a *alipayAdapter) Create(ctx context.Context, req *system.PaymentRequest,
if err != nil {
return nil, err
}
return &system.PaymentResult{
Provider: system.PaymentAlipay, Status: "created", TradeNo: req.TradeNo,
return &bizpayment.PaymentResult{
Provider: bizpayment.PaymentAlipay, Status: "created", TradeNo: req.TradeNo,
Payload: mustMarshalAlipayPayload(map[string]string{"pay_url": payURL}),
}, nil
default:
@@ -173,14 +173,14 @@ func (a *alipayAdapter) Create(ctx context.Context, req *system.PaymentRequest,
if providerTradeNo == "" {
return nil, errors.New("支付宝创建响应缺少 trade_no")
}
return &system.PaymentResult{
Provider: system.PaymentAlipay, Status: "created", TradeNo: req.TradeNo,
return &bizpayment.PaymentResult{
Provider: bizpayment.PaymentAlipay, Status: "created", TradeNo: req.TradeNo,
ProviderTradeNo: providerTradeNo, Payload: sdk.payload(rsp),
}, nil
}
}
func (a *alipayAdapter) Query(ctx context.Context, tradeNo string, c map[string]any) (*system.PaymentResult, error) {
func (a *alipayAdapter) Query(ctx context.Context, tradeNo string, c map[string]any) (*bizpayment.PaymentResult, error) {
tradeNo = strings.TrimSpace(tradeNo)
if tradeNo == "" {
return nil, errors.New("支付宝查单缺少 out_trade_no")
@@ -195,8 +195,8 @@ func (a *alipayAdapter) Query(ctx context.Context, tradeNo string, c map[string]
return nil, err
}
response := rsp.Response
result := &system.PaymentResult{
Provider: system.PaymentAlipay, Status: normalizePaymentStatus(response.TradeStatus, "pending"),
result := &bizpayment.PaymentResult{
Provider: bizpayment.PaymentAlipay, Status: normalizePaymentStatus(response.TradeStatus, "pending"),
TradeNo: strings.TrimSpace(response.OutTradeNo), ProviderTradeNo: strings.TrimSpace(response.TradeNo),
Payload: sdk.payload(rsp),
}
@@ -229,7 +229,7 @@ func (a *alipayAdapter) Query(ctx context.Context, tradeNo string, c map[string]
return result, nil
}
func (a *alipayAdapter) Refund(ctx context.Context, req *system.PaymentRefundRequest, c map[string]any) (*system.PaymentResult, error) {
func (a *alipayAdapter) Refund(ctx context.Context, req *bizpayment.PaymentRefundRequest, c map[string]any) (*bizpayment.PaymentResult, error) {
if req == nil {
return nil, errors.New("支付宝退款请求为空")
}
@@ -257,7 +257,7 @@ func (a *alipayAdapter) Refund(ctx context.Context, req *system.PaymentRefundReq
return alipayRefundResult(req, response, sdk.payload(rsp))
}
func alipayRefundResult(req *system.PaymentRefundRequest, response *gopayAlipay.TradeRefund, payload []byte) (*system.PaymentResult, error) {
func alipayRefundResult(req *bizpayment.PaymentRefundRequest, response *gopayAlipay.TradeRefund, payload []byte) (*bizpayment.PaymentResult, error) {
if req == nil || response == nil {
return nil, errors.New("支付宝退款响应为空")
}
@@ -297,13 +297,13 @@ func alipayRefundResult(req *system.PaymentRefundRequest, response *gopayAlipay.
if currency == "" {
currency = "CNY"
}
return &system.PaymentResult{
Provider: system.PaymentAlipay, Status: "created", TradeNo: tradeNo,
return &bizpayment.PaymentResult{
Provider: bizpayment.PaymentAlipay, Status: "created", TradeNo: tradeNo,
ProviderTradeNo: providerTradeNo, Amount: amount, Currency: currency, Payload: payload,
}, nil
}
func (a *alipayAdapter) Callback(_ context.Context, callback *system.PaymentCallback, c map[string]any) (*system.PaymentResult, error) {
func (a *alipayAdapter) Callback(_ context.Context, callback *bizpayment.PaymentCallback, c map[string]any) (*bizpayment.PaymentResult, error) {
if callback == nil || len(callback.Body) == 0 {
return nil, errors.New("支付宝回调为空")
}
@@ -319,8 +319,8 @@ func (a *alipayAdapter) Callback(_ context.Context, callback *system.PaymentCall
status = "success"
}
payload, _ := json.Marshal(fields)
return &system.PaymentResult{
Provider: system.PaymentAlipay, Status: status,
return &bizpayment.PaymentResult{
Provider: bizpayment.PaymentAlipay, Status: status,
TradeNo: first(fields, "out_trade_no"), ProviderTradeNo: first(fields, "trade_no"),
Payload: payload,
}, nil
@@ -481,7 +481,7 @@ func firstNonEmptyAlipay(values ...string) string {
return ""
}
func populateAlipayBreakdown(result *system.PaymentResult, response map[string]any) error {
func populateAlipayBreakdown(result *bizpayment.PaymentResult, response map[string]any) error {
if result == nil || result.Status != "success" {
return nil
}