yvan/kra-oa
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/connectivity.go
+5 -5
View File
@@ -5,7 +5,7 @@ import (
"encoding/json"
"errors"
"fmt"
"kra/internal/biz/system"
integrationbiz "kra/internal/biz/integration"
"strings"
"kra/internal/integration/mq"
@@ -23,7 +23,7 @@ func NewConnectivityTester(store *runtimeconfig.Store) *ConnectivityTester {
return &ConnectivityTester{store: store}
}
func (t *ConnectivityTester) TestIntegration(ctx context.Context, config *system.IntegrationConfig) error {
func (t *ConnectivityTester) TestIntegration(ctx context.Context, config *integrationbiz.IntegrationConfig) error {
if config == nil {
return errors.New("集成配置请求为空")
}
@@ -39,9 +39,9 @@ func (t *ConnectivityTester) TestIntegration(ctx context.Context, config *system
return fmt.Errorf("编码集成配置失败: %w", err)
}
switch strings.ToLower(strings.TrimSpace(config.Kind)) {
case system.IntegrationKindMQ:
case integrationbiz.IntegrationKindMQ:
return mq.TestConfig(ctx, config.Provider, raw)
case system.IntegrationKindWebSocket:
case integrationbiz.IntegrationKindWebSocket:
if strings.ToLower(strings.TrimSpace(config.Provider)) != websocketintegration.ProviderMelody {
return fmt.Errorf("不支持的 WebSocket provider %q", config.Provider)
}
@@ -52,7 +52,7 @@ func (t *ConnectivityTester) TestIntegration(ctx context.Context, config *system
}
func (t *ConnectivityTester) restoreMaskedSecrets(kind, provider string, values map[string]any) error {
definition, ok := system.IntegrationDefinition(kind, provider)
definition, ok := integrationbiz.IntegrationDefinition(kind, provider)
if !ok {
return fmt.Errorf("不支持的集成 %s/%s", kind, provider)
}
internal/integration/payment/adapter.go
+22 -22
View File
@@ -3,52 +3,52 @@ package payment
import (
"context"
"fmt"
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
)
// Adapter is the provider boundary used by the payment repository. Provider
// SDK types stay in this package and are normalized to biz.PaymentResult.
// SDK types stay in this package and are normalized to biz/payment results.
type Adapter interface {
Create(context.Context, *system.PaymentRequest, map[string]any) (*system.PaymentResult, error)
Query(context.Context, string, map[string]any) (*system.PaymentResult, error)
Refund(context.Context, *system.PaymentRefundRequest, map[string]any) (*system.PaymentResult, error)
Callback(context.Context, *system.PaymentCallback, map[string]any) (*system.PaymentResult, error)
Create(context.Context, *bizpayment.PaymentRequest, map[string]any) (*bizpayment.PaymentResult, error)
Query(context.Context, string, map[string]any) (*bizpayment.PaymentResult, error)
Refund(context.Context, *bizpayment.PaymentRefundRequest, map[string]any) (*bizpayment.PaymentResult, error)
Callback(context.Context, *bizpayment.PaymentCallback, map[string]any) (*bizpayment.PaymentResult, error)
}
// New constructs the SDK-backed adapter for a configured provider.
func New(provider string) (Adapter, error) {
switch provider {
case system.PaymentAlipay:
case bizpayment.PaymentAlipay:
return &alipayAdapter{}, nil
case system.PaymentAlipayV3:
case bizpayment.PaymentAlipayV3:
return &alipayV3Adapter{}, nil
case system.PaymentWechatV2:
case bizpayment.PaymentWechatV2:
return &wechatV2Adapter{}, nil
case system.PaymentWechatV3:
case bizpayment.PaymentWechatV3:
return &wechatV3Adapter{}, nil
case system.PaymentApple:
case bizpayment.PaymentApple:
return &appleAdapter{}, nil
case system.PaymentDouyin:
case bizpayment.PaymentDouyin:
return &douyinAdapter{}, nil
case system.PaymentQQ:
case bizpayment.PaymentQQ:
return &qqAdapter{}, nil
case system.PaymentAllinPay:
case bizpayment.PaymentAllinPay:
return &allinpayAdapter{}, nil
case system.PaymentLakala:
case bizpayment.PaymentLakala:
return &lakalaAdapter{}, nil
case system.PaymentPayPal:
case bizpayment.PaymentPayPal:
return &paypalAdapter{}, nil
case system.PaymentSaobei:
case bizpayment.PaymentSaobei:
return &saobeiAdapter{}, nil
case system.PaymentChinaums:
case bizpayment.PaymentChinaums:
return newVendorAdapter(provider, vendorChinaums), nil
case system.PaymentSFT:
case bizpayment.PaymentSFT:
return newVendorAdapter(provider, vendorSFT), nil
case system.PaymentSuperPay:
case bizpayment.PaymentSuperPay:
return newVendorAdapter(provider, vendorSupperPay), nil
case system.PaymentWechatGame:
case bizpayment.PaymentWechatGame:
return newVendorAdapter(provider, vendorWechatGame), nil
case system.PaymentDouyinGame:
case bizpayment.PaymentDouyinGame:
return newVendorAdapter(provider, vendorDouyinGame), nil
default:
return nil, fmt.Errorf("支付渠道 %s 没有适配器", provider)
internal/integration/payment/adapter_test.go
+2 -2
View File
@@ -1,12 +1,12 @@
package payment
import (
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"testing"
)
func TestEverySupportedProviderHasAdapter(t *testing.T) {
for _, provider := range system.SupportedPaymentProviders {
for _, provider := range bizpayment.SupportedPaymentProviders {
t.Run(provider, func(t *testing.T) {
adapter, err := New(provider)
if err != nil {
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
}
internal/integration/payment/alipay_v3.go
+24 -24
View File
@@ -5,7 +5,7 @@ import (
"encoding/json"
"errors"
"fmt"
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"net/http"
"net/url"
"os"
@@ -25,7 +25,7 @@ type alipayV3Client struct {
gateway *url.URL
}
func (a *alipayV3Adapter) Create(ctx context.Context, req *system.PaymentRequest, c map[string]any) (*system.PaymentResult, error) {
func (a *alipayV3Adapter) Create(ctx context.Context, req *bizpayment.PaymentRequest, c map[string]any) (*bizpayment.PaymentResult, error) {
if req == nil {
return nil, errors.New("支付宝 V3 下单参数为空")
}
@@ -93,8 +93,8 @@ func (a *alipayV3Adapter) Create(ctx context.Context, req *system.PaymentRequest
if strings.TrimSpace(rsp.QrCode) == "" {
return nil, errors.New("支付宝 V3 预创建响应缺少 qr_code")
}
return &system.PaymentResult{
Provider: system.PaymentAlipayV3, Status: "created", TradeNo: req.TradeNo,
return &bizpayment.PaymentResult{
Provider: bizpayment.PaymentAlipayV3, Status: "created", TradeNo: req.TradeNo,
QueryID: outTradeNo, Payload: mustJSON(rsp),
}, nil
case "alipay.trade.app.pay":
@@ -105,8 +105,8 @@ func (a *alipayV3Adapter) Create(ctx context.Context, req *system.PaymentRequest
if strings.TrimSpace(orderString) == "" {
return nil, errors.New("支付宝 V3 APP 支付参数为空")
}
return &system.PaymentResult{
Provider: system.PaymentAlipayV3, Status: "created", TradeNo: req.TradeNo,
return &bizpayment.PaymentResult{
Provider: bizpayment.PaymentAlipayV3, Status: "created", TradeNo: req.TradeNo,
Payload: mustJSON(map[string]string{"order_string": orderString}),
}, nil
case "alipay.trade.page.pay":
@@ -121,8 +121,8 @@ func (a *alipayV3Adapter) Create(ctx context.Context, req *system.PaymentRequest
if strings.TrimSpace(payURL) == "" {
return nil, errors.New("支付宝 V3 电脑网站支付 URL 为空")
}
return &system.PaymentResult{
Provider: system.PaymentAlipayV3, Status: "created", TradeNo: req.TradeNo,
return &bizpayment.PaymentResult{
Provider: bizpayment.PaymentAlipayV3, Status: "created", TradeNo: req.TradeNo,
Payload: mustJSON(map[string]string{"pay_url": payURL}),
}, nil
case "alipay.trade.wap.pay":
@@ -137,8 +137,8 @@ func (a *alipayV3Adapter) Create(ctx context.Context, req *system.PaymentRequest
if strings.TrimSpace(payURL) == "" {
return nil, errors.New("支付宝 V3 手机网站支付 URL 为空")
}
return &system.PaymentResult{
Provider: system.PaymentAlipayV3, Status: "created", TradeNo: req.TradeNo,
return &bizpayment.PaymentResult{
Provider: bizpayment.PaymentAlipayV3, Status: "created", TradeNo: req.TradeNo,
Payload: mustJSON(map[string]string{"pay_url": payURL}),
}, nil
default:
@@ -166,14 +166,14 @@ func (a *alipayV3Adapter) Create(ctx context.Context, req *system.PaymentRequest
if providerTradeNo == "" {
return nil, errors.New("支付宝 V3 创建响应缺少 trade_no")
}
return &system.PaymentResult{
Provider: system.PaymentAlipayV3, Status: "created", TradeNo: req.TradeNo,
return &bizpayment.PaymentResult{
Provider: bizpayment.PaymentAlipayV3, Status: "created", TradeNo: req.TradeNo,
ProviderTradeNo: providerTradeNo, QueryID: outTradeNo, Payload: mustJSON(rsp),
}, nil
}
}
func (a *alipayV3Adapter) Query(ctx context.Context, tradeNo string, c map[string]any) (*system.PaymentResult, error) {
func (a *alipayV3Adapter) Query(ctx context.Context, tradeNo string, c map[string]any) (*bizpayment.PaymentResult, error) {
tradeNo = strings.TrimSpace(tradeNo)
if tradeNo == "" {
return nil, errors.New("支付宝 V3 查单缺少 out_trade_no")
@@ -196,8 +196,8 @@ func (a *alipayV3Adapter) Query(ctx context.Context, tradeNo string, c map[strin
if outTradeNo == "" || outTradeNo != tradeNo {
return nil, errors.New("支付宝 V3 查询响应的 out_trade_no 缺失或不匹配")
}
result := &system.PaymentResult{
Provider: system.PaymentAlipayV3, Status: normalizePaymentStatus(rsp.TradeStatus, "pending"),
result := &bizpayment.PaymentResult{
Provider: bizpayment.PaymentAlipayV3, Status: normalizePaymentStatus(rsp.TradeStatus, "pending"),
TradeNo: outTradeNo, ProviderTradeNo: strings.TrimSpace(rsp.TradeNo),
Currency: alipayV3Currency(c, ""), Payload: mustJSON(rsp),
}
@@ -221,7 +221,7 @@ func (a *alipayV3Adapter) Query(ctx context.Context, tradeNo string, c map[strin
return result, nil
}
func (a *alipayV3Adapter) Refund(ctx context.Context, req *system.PaymentRefundRequest, c map[string]any) (*system.PaymentResult, error) {
func (a *alipayV3Adapter) Refund(ctx context.Context, req *bizpayment.PaymentRefundRequest, c map[string]any) (*bizpayment.PaymentResult, error) {
if req == nil {
return nil, errors.New("支付宝 V3 退款请求为空")
}
@@ -272,14 +272,14 @@ func (a *alipayV3Adapter) Refund(ctx context.Context, req *system.PaymentRefundR
if refundedAmount != req.Amount {
return nil, errors.New("支付宝 V3 退款响应金额不匹配")
}
return &system.PaymentResult{
Provider: system.PaymentAlipayV3, Status: "created", TradeNo: tradeNo,
return &bizpayment.PaymentResult{
Provider: bizpayment.PaymentAlipayV3, Status: "created", TradeNo: tradeNo,
ProviderTradeNo: providerTradeNo, Amount: refundedAmount,
Currency: alipayV3Currency(c, req.Currency), Payload: mustJSON(rsp),
}, nil
}
func (a *alipayV3Adapter) Callback(_ context.Context, callback *system.PaymentCallback, c map[string]any) (*system.PaymentResult, error) {
func (a *alipayV3Adapter) Callback(_ context.Context, callback *bizpayment.PaymentCallback, c map[string]any) (*bizpayment.PaymentResult, error) {
if callback == nil || len(callback.Body) == 0 {
return nil, errors.New("支付宝 V3 回调为空")
}
@@ -305,13 +305,13 @@ func (a *alipayV3Adapter) Callback(_ context.Context, callback *system.PaymentCa
return nil, errors.New("支付宝 V3 回调缺少 out_trade_no 或 trade_no")
}
payload, _ := json.Marshal(fields)
return &system.PaymentResult{
Provider: system.PaymentAlipayV3, Status: normalizePaymentStatus(fields["trade_status"], "pending"),
return &bizpayment.PaymentResult{
Provider: bizpayment.PaymentAlipayV3, Status: normalizePaymentStatus(fields["trade_status"], "pending"),
TradeNo: tradeNo, ProviderTradeNo: providerTradeNo, Payload: payload,
}, nil
}
func alipayV3TradePayResult(req *system.PaymentRequest, rsp *gopayAlipayV3.TradePayRsp) (*system.PaymentResult, error) {
func alipayV3TradePayResult(req *bizpayment.PaymentRequest, rsp *gopayAlipayV3.TradePayRsp) (*bizpayment.PaymentResult, error) {
if req == nil || rsp == nil {
return nil, errors.New("支付宝 V3 付款码支付响应为空")
}
@@ -330,8 +330,8 @@ func alipayV3TradePayResult(req *system.PaymentRequest, rsp *gopayAlipayV3.Trade
if amount != req.Amount {
return nil, errors.New("支付宝 V3 付款码支付响应金额不匹配")
}
result := &system.PaymentResult{
Provider: system.PaymentAlipayV3, Status: "success", TradeNo: outTradeNo,
result := &bizpayment.PaymentResult{
Provider: bizpayment.PaymentAlipayV3, Status: "success", TradeNo: outTradeNo,
ProviderTradeNo: providerTradeNo, Amount: amount,
Currency: strings.ToUpper(strings.TrimSpace(req.Currency)), Payload: mustJSON(rsp),
}
internal/integration/payment/alipay_v3_test.go
+10 -10
View File
@@ -9,7 +9,7 @@ import (
"encoding/json"
"encoding/pem"
"io"
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"math/big"
"net/http"
"net/http/httptest"
@@ -135,8 +135,8 @@ func TestAlipayV3CreateRESTMethodsUseGoPay(t *testing.T) {
if tc.method != "" {
extra["method"] = tc.method
}
result, err := (&alipayV3Adapter{}).Create(context.Background(), &system.PaymentRequest{
Provider: system.PaymentAlipayV3, TradeNo: tradeNo, Subject: "subject", Amount: 1000,
result, err := (&alipayV3Adapter{}).Create(context.Background(), &bizpayment.PaymentRequest{
Provider: bizpayment.PaymentAlipayV3, TradeNo: tradeNo, Subject: "subject", Amount: 1000,
Currency: "CNY", NotifyURL: "https://merchant.example/alipay-v3/notify", Extra: extra,
}, config)
if err != nil {
@@ -145,7 +145,7 @@ func TestAlipayV3CreateRESTMethodsUseGoPay(t *testing.T) {
if requestBody == nil || requestBody["out_trade_no"] != tradeNo || requestBody["notify_url"] == "" {
t.Fatalf("request body = %#v", requestBody)
}
if result.Provider != system.PaymentAlipayV3 || result.Status != tc.wantStatus || result.TradeNo != tradeNo || result.ProviderTradeNo != tc.wantTrade {
if result.Provider != bizpayment.PaymentAlipayV3 || result.Status != tc.wantStatus || result.TradeNo != tradeNo || result.ProviderTradeNo != tc.wantTrade {
t.Fatalf("result = %+v", result)
}
if tc.method == "barcode" {
@@ -168,8 +168,8 @@ func TestAlipayV3GeneratedPaymentMethodsUseGoPay(t *testing.T) {
config["gateway_url"] = "https://merchant-gateway.example/gateway.do"
for _, method := range []string{"app", "page", "wap"} {
t.Run(method, func(t *testing.T) {
result, err := (&alipayV3Adapter{}).Create(context.Background(), &system.PaymentRequest{
Provider: system.PaymentAlipayV3, TradeNo: "T-V3-" + strings.ToUpper(method), Subject: "subject",
result, err := (&alipayV3Adapter{}).Create(context.Background(), &bizpayment.PaymentRequest{
Provider: bizpayment.PaymentAlipayV3, TradeNo: "T-V3-" + strings.ToUpper(method), Subject: "subject",
Amount: 1000, Currency: "CNY", NotifyURL: "https://merchant.example/alipay-v3/notify",
ReturnURL: "https://merchant.example/alipay-v3/return", Extra: map[string]any{"method": method},
}, config)
@@ -272,8 +272,8 @@ func TestAlipayV3RefundValidatesResponse(t *testing.T) {
defer server.Close()
config := cloneAlipayV3Config(baseConfig)
config["api_base_url"] = server.URL
result, err := (&alipayV3Adapter{}).Refund(context.Background(), &system.PaymentRefundRequest{
Provider: system.PaymentAlipayV3, TradeNo: "T-V3-REFUND", ProviderTradeNo: "P-V3-REFUND",
result, err := (&alipayV3Adapter{}).Refund(context.Background(), &bizpayment.PaymentRefundRequest{
Provider: bizpayment.PaymentAlipayV3, TradeNo: "T-V3-REFUND", ProviderTradeNo: "P-V3-REFUND",
RefundNo: "R-V3-REFUND", Amount: 123, Currency: "CNY",
}, config)
if tc.wantError {
@@ -315,14 +315,14 @@ func TestAlipayV3CallbackUsesGoPayCertificateVerification(t *testing.T) {
for key, value := range fields {
values.Set(key, value)
}
callback := &system.PaymentCallback{
callback := &bizpayment.PaymentCallback{
Body: []byte(values.Encode()), Headers: map[string]string{"Content-Type": "application/x-www-form-urlencoded"},
}
result, err := (&alipayV3Adapter{}).Callback(context.Background(), callback, config)
if err != nil {
t.Fatal(err)
}
if result.Provider != system.PaymentAlipayV3 || result.Status != "success" || result.TradeNo != "T-V3-CALLBACK" || result.ProviderTradeNo != "P-V3-CALLBACK" {
if result.Provider != bizpayment.PaymentAlipayV3 || result.Status != "success" || result.TradeNo != "T-V3-CALLBACK" || result.ProviderTradeNo != "P-V3-CALLBACK" {
t.Fatalf("callback result = %+v", result)
}
callback.Body = []byte(strings.ReplaceAll(values.Encode(), "P-V3-CALLBACK", "P-V3-TAMPERED"))
internal/integration/payment/allinpay.go
+11 -11
View File
@@ -11,7 +11,7 @@ import (
"errors"
"fmt"
"io"
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"net/http"
"strings"
"sync"
@@ -120,7 +120,7 @@ func (a *allinpayAdapter) client(c map[string]any) (*allinpay.Client, error) {
return client, nil
}
func (a *allinpayAdapter) Create(ctx context.Context, req *system.PaymentRequest, c map[string]any) (*system.PaymentResult, error) {
func (a *allinpayAdapter) Create(ctx context.Context, req *bizpayment.PaymentRequest, c map[string]any) (*bizpayment.PaymentResult, error) {
if req == nil {
return nil, errors.New("通联支付下单请求为空")
}
@@ -158,7 +158,7 @@ func (a *allinpayAdapter) Create(ctx context.Context, req *system.PaymentRequest
if returnedTradeNo := strings.TrimSpace(rsp.Reqsn); returnedTradeNo != "" && returnedTradeNo != strings.TrimSpace(req.TradeNo) {
return nil, errors.New("通联支付扫码响应的 reqsn 不匹配")
}
return &system.PaymentResult{Provider: system.PaymentAllinPay, Status: normalizeAllinState(rsp.TrxStatus), TradeNo: req.TradeNo, ProviderTradeNo: strings.TrimSpace(rsp.Trxid), QueryID: queryID, Payload: mustJSON(rsp)}, nil
return &bizpayment.PaymentResult{Provider: bizpayment.PaymentAllinPay, Status: normalizeAllinState(rsp.TrxStatus), TradeNo: req.TradeNo, ProviderTradeNo: strings.TrimSpace(rsp.Trxid), QueryID: queryID, Payload: mustJSON(rsp)}, nil
}
if method == "native" {
if orderType == allinpay.OrderTypeTrxId {
@@ -175,7 +175,7 @@ func (a *allinpayAdapter) Create(ctx context.Context, req *system.PaymentRequest
if returnedTradeNo := strings.TrimSpace(rsp.ReqSn); returnedTradeNo != "" && returnedTradeNo != strings.TrimSpace(req.TradeNo) {
return nil, errors.New("通联支付 Native 响应的 reqsn 不匹配")
}
return &system.PaymentResult{Provider: system.PaymentAllinPay, Status: "created", TradeNo: req.TradeNo, Payload: mustJSON(rsp)}, nil
return &bizpayment.PaymentResult{Provider: bizpayment.PaymentAllinPay, Status: "created", TradeNo: req.TradeNo, Payload: mustJSON(rsp)}, nil
}
payType := firstAny(req.Extra, "paytype", "pay_type")
if payType == "" {
@@ -199,7 +199,7 @@ func (a *allinpayAdapter) Create(ctx context.Context, req *system.PaymentRequest
if err != nil {
return nil, err
}
return &system.PaymentResult{Provider: system.PaymentAllinPay, Status: "created", TradeNo: req.TradeNo, ProviderTradeNo: strings.TrimSpace(rsp.Trxid), QueryID: queryID, Payload: mustJSON(rsp)}, nil
return &bizpayment.PaymentResult{Provider: bizpayment.PaymentAllinPay, Status: "created", TradeNo: req.TradeNo, ProviderTradeNo: strings.TrimSpace(rsp.Trxid), QueryID: queryID, Payload: mustJSON(rsp)}, nil
}
func allinpayCreateMethod(extra, config map[string]any) (string, error) {
@@ -220,7 +220,7 @@ func allinpayCreateMethod(extra, config map[string]any) (string, error) {
}
}
func (a *allinpayAdapter) Query(ctx context.Context, tradeNo string, c map[string]any) (*system.PaymentResult, error) {
func (a *allinpayAdapter) Query(ctx context.Context, tradeNo string, c map[string]any) (*bizpayment.PaymentResult, error) {
orderType, err := allinpayOrderType(c)
if err != nil {
return nil, err
@@ -247,7 +247,7 @@ func (a *allinpayAdapter) Query(ctx context.Context, tradeNo string, c map[strin
if rsp == nil {
return nil, errors.New("通联支付查单响应为空")
}
result := &system.PaymentResult{Provider: system.PaymentAllinPay, Status: normalizeAllinState(rsp.TrxStatus), TradeNo: strings.TrimSpace(rsp.Reqsn), ProviderTradeNo: strings.TrimSpace(rsp.Trxid), Currency: strings.ToUpper(firstAny(c, "currency")), Payload: mustJSON(rsp)}
result := &bizpayment.PaymentResult{Provider: bizpayment.PaymentAllinPay, Status: normalizeAllinState(rsp.TrxStatus), TradeNo: strings.TrimSpace(rsp.Reqsn), ProviderTradeNo: strings.TrimSpace(rsp.Trxid), Currency: strings.ToUpper(firstAny(c, "currency")), Payload: mustJSON(rsp)}
if strings.EqualFold(orderType, allinpay.OrderTypeTrxId) {
if result.ProviderTradeNo == "" {
return nil, errors.New("通联支付查单响应缺少 trxid")
@@ -300,7 +300,7 @@ func allinpayCreateQueryID(orderType, transactionID string) (string, error) {
return "", nil
}
func (a *allinpayAdapter) Refund(ctx context.Context, req *system.PaymentRefundRequest, c map[string]any) (*system.PaymentResult, error) {
func (a *allinpayAdapter) Refund(ctx context.Context, req *bizpayment.PaymentRefundRequest, c map[string]any) (*bizpayment.PaymentResult, error) {
if req == nil {
return nil, errors.New("通联支付退款请求为空")
}
@@ -345,7 +345,7 @@ func (a *allinpayAdapter) Refund(ctx context.Context, req *system.PaymentRefundR
return allinpayRefundResult(&effective, rsp, firstAny(c, "currency"))
}
func allinpayRefundResult(req *system.PaymentRefundRequest, rsp *allinpay.RefundRsp, currency string) (*system.PaymentResult, error) {
func allinpayRefundResult(req *bizpayment.PaymentRefundRequest, rsp *allinpay.RefundRsp, currency string) (*bizpayment.PaymentResult, error) {
if rsp == nil {
return nil, errors.New("通联支付退款响应为空")
}
@@ -368,9 +368,9 @@ func allinpayRefundResult(req *system.PaymentRefundRequest, rsp *allinpay.Refund
if refundAmount != req.Amount {
return nil, errors.New("通联支付退款响应金额不匹配")
}
return &system.PaymentResult{Provider: system.PaymentAllinPay, Status: normalizeRefundState(rsp.TrxStatus), TradeNo: req.TradeNo, ProviderTradeNo: providerRefundID, Amount: refundAmount, Currency: strings.ToUpper(strings.TrimSpace(currency)), Payload: mustJSON(rsp)}, nil
return &bizpayment.PaymentResult{Provider: bizpayment.PaymentAllinPay, Status: normalizeRefundState(rsp.TrxStatus), TradeNo: req.TradeNo, ProviderTradeNo: providerRefundID, Amount: refundAmount, Currency: strings.ToUpper(strings.TrimSpace(currency)), Payload: mustJSON(rsp)}, nil
}
func (a *allinpayAdapter) Callback(_ context.Context, _ *system.PaymentCallback, _ map[string]any) (*system.PaymentResult, error) {
func (a *allinpayAdapter) Callback(_ context.Context, _ *bizpayment.PaymentCallback, _ map[string]any) (*bizpayment.PaymentResult, error) {
return nil, errors.New("通联支付回调没有可复用的 GoPay 验签器，请改用主动查单")
}
internal/integration/payment/allinpay_test.go
+10 -10
View File
@@ -11,7 +11,7 @@ import (
"encoding/base64"
"encoding/json"
"io"
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"net"
"net/http"
"net/http/httptest"
@@ -120,8 +120,8 @@ func TestAllinPayTrxIDCreateRejectsResponseWithoutTransactionID(t *testing.T) {
_, _ = w.Write(response)
}))
_, err := (&allinpayAdapter{}).Create(context.Background(), &system.PaymentRequest{
Provider: system.PaymentAllinPay, TradeNo: "MERCHANT-TRXID-MISSING", Subject: "subject",
_, err := (&allinpayAdapter{}).Create(context.Background(), &bizpayment.PaymentRequest{
Provider: bizpayment.PaymentAllinPay, TradeNo: "MERCHANT-TRXID-MISSING", Subject: "subject",
Amount: 100, Currency: "CNY",
}, allinPayTestConfig(privateKey, publicKey, allinpay.OrderTypeTrxId))
if err == nil || !strings.Contains(strings.ToLower(err.Error()), "trxid") {
@@ -131,8 +131,8 @@ func TestAllinPayTrxIDCreateRejectsResponseWithoutTransactionID(t *testing.T) {
func TestAllinPayNativeCreateRejectsTrxIDLookupMode(t *testing.T) {
_, privateKey, publicKey := allinPayTestKeys(t)
_, err := (&allinpayAdapter{}).Create(context.Background(), &system.PaymentRequest{
Provider: system.PaymentAllinPay, TradeNo: "MERCHANT-NATIVE-TRXID", Subject: "subject",
_, err := (&allinpayAdapter{}).Create(context.Background(), &bizpayment.PaymentRequest{
Provider: bizpayment.PaymentAllinPay, TradeNo: "MERCHANT-NATIVE-TRXID", Subject: "subject",
Amount: 100, Currency: "CNY", Extra: map[string]any{"method": "native", "expiretime": "20261231235959"},
}, allinPayTestConfig(privateKey, publicKey, allinpay.OrderTypeTrxId))
if err == nil || !strings.Contains(strings.ToLower(err.Error()), "native") || !strings.Contains(strings.ToLower(err.Error()), "trxid") {
@@ -141,8 +141,8 @@ func TestAllinPayNativeCreateRejectsTrxIDLookupMode(t *testing.T) {
}
func TestAllinPayCreateRejectsUnknownMethodBeforeClient(t *testing.T) {
_, err := (&allinpayAdapter{}).Create(context.Background(), &system.PaymentRequest{
Provider: system.PaymentAllinPay, TradeNo: "MERCHANT-UNKNOWN-METHOD", Subject: "subject",
_, err := (&allinpayAdapter{}).Create(context.Background(), &bizpayment.PaymentRequest{
Provider: bizpayment.PaymentAllinPay, TradeNo: "MERCHANT-UNKNOWN-METHOD", Subject: "subject",
Amount: 100, Currency: "CNY", Extra: map[string]any{"method": "unsupported"},
}, nil)
if err == nil || !strings.Contains(err.Error(), "不支持的下单方式") {
@@ -248,8 +248,8 @@ func TestAllinPayRefundUsesConfiguredLookupIdentity(t *testing.T) {
_, _ = w.Write(response)
}))
result, err := (&allinpayAdapter{}).Refund(context.Background(), &system.PaymentRefundRequest{
Provider: system.PaymentAllinPay, TradeNo: tc.tradeNo, QueryID: tc.queryID,
result, err := (&allinpayAdapter{}).Refund(context.Background(), &bizpayment.PaymentRefundRequest{
Provider: bizpayment.PaymentAllinPay, TradeNo: tc.tradeNo, QueryID: tc.queryID,
RefundNo: "REFUND-1", Amount: 40, TotalAmount: 100, Currency: "CNY",
}, allinPayTestConfig(privateKey, publicKey, tc.orderType))
if err != nil {
@@ -263,7 +263,7 @@ func TestAllinPayRefundUsesConfiguredLookupIdentity(t *testing.T) {
}
func TestAllinPayRefundResultBindsRefundIdentity(t *testing.T) {
req := &system.PaymentRefundRequest{TradeNo: "LOCAL-1", RefundNo: "REFUND-1", Amount: 40, Currency: "CNY"}
req := &bizpayment.PaymentRefundRequest{TradeNo: "LOCAL-1", RefundNo: "REFUND-1", Amount: 40, Currency: "CNY"}
base := func() *allinpay.RefundRsp {
return &allinpay.RefundRsp{Reqsn: "REFUND-1", Trxid: "ALLIN-REFUND-1", TrxStatus: "SUCCESS", Fee: "40"}
}
internal/integration/payment/apple.go
+9 -9
View File
@@ -5,7 +5,7 @@ import (
"encoding/json"
"errors"
"fmt"
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"math"
"strings"
@@ -15,7 +15,7 @@ import (
type appleAdapter struct{}
func (a *appleAdapter) Create(_ context.Context, req *system.PaymentRequest, _ map[string]any) (*system.PaymentResult, error) {
func (a *appleAdapter) Create(_ context.Context, req *bizpayment.PaymentRequest, _ map[string]any) (*bizpayment.PaymentResult, error) {
if req == nil {
return nil, errors.New("Apple 内购下单参数为空")
}
@@ -30,9 +30,9 @@ func (a *appleAdapter) Create(_ context.Context, req *system.PaymentRequest, _ m
return nil, errors.New("Apple 内购 tradeNo 必须是用于 appAccountToken 的 UUID")
}
payload, _ := json.Marshal(map[string]any{"product_id": productID, "app_account_token": req.TradeNo, "client_only": true, "trade_no": req.TradeNo})
return &system.PaymentResult{Provider: system.PaymentApple, Status: "client_pending", TradeNo: req.TradeNo, Payload: payload}, nil
return &bizpayment.PaymentResult{Provider: bizpayment.PaymentApple, Status: "client_pending", TradeNo: req.TradeNo, Payload: payload}, nil
}
func (a *appleAdapter) Query(ctx context.Context, transactionID string, c map[string]any) (*system.PaymentResult, error) {
func (a *appleAdapter) Query(ctx context.Context, transactionID string, c map[string]any) (*bizpayment.PaymentResult, error) {
transactionID = strings.TrimSpace(transactionID)
if transactionID == "" {
return nil, errors.New("Apple 查询缺少 transactionId")
@@ -81,10 +81,10 @@ func (a *appleAdapter) Query(ctx context.Context, transactionID string, c map[st
}
return result, nil
}
func (a *appleAdapter) Refund(context.Context, *system.PaymentRefundRequest, map[string]any) (*system.PaymentResult, error) {
func (a *appleAdapter) Refund(context.Context, *bizpayment.PaymentRefundRequest, map[string]any) (*bizpayment.PaymentResult, error) {
return nil, errors.New("Apple 内购退款由 App Store 管理，服务端不提供主动退款接口")
}
func (a *appleAdapter) Callback(_ context.Context, callback *system.PaymentCallback, c map[string]any) (*system.PaymentResult, error) {
func (a *appleAdapter) Callback(_ context.Context, callback *bizpayment.PaymentCallback, c map[string]any) (*bizpayment.PaymentResult, error) {
if callback == nil {
return nil, errors.New("Apple 回调为空")
}
@@ -139,7 +139,7 @@ func (a *appleAdapter) Callback(_ context.Context, callback *system.PaymentCallb
if _, parseErr := uuid.Parse(tradeNo); parseErr != nil {
return nil, errors.New("Apple 回调 appAccountToken 不是有效 UUID")
}
return &system.PaymentResult{Provider: system.PaymentApple, Status: "pending", TradeNo: tradeNo, ProviderTradeNo: transactionID, QueryID: transactionID, Payload: payload}, nil
return &bizpayment.PaymentResult{Provider: bizpayment.PaymentApple, Status: "pending", TradeNo: tradeNo, ProviderTradeNo: transactionID, QueryID: transactionID, Payload: payload}, nil
}
func appleClaims(value any) (map[string]any, error) {
@@ -154,7 +154,7 @@ func appleClaims(value any) (map[string]any, error) {
return claims, nil
}
func applePaymentResult(transactionID string, claims map[string]any, payload []byte, c map[string]any) (*system.PaymentResult, error) {
func applePaymentResult(transactionID string, claims map[string]any, payload []byte, c map[string]any) (*bizpayment.PaymentResult, error) {
revoked, err := appleRevoked(claims)
if err != nil {
return nil, err
@@ -174,7 +174,7 @@ func applePaymentResult(transactionID string, claims map[string]any, payload []b
if _, err := uuid.Parse(tradeNo); err != nil {
return nil, errors.New("Apple 交易 appAccountToken 不是有效 UUID")
}
result := &system.PaymentResult{Provider: system.PaymentApple, Status: status, TradeNo: tradeNo, ProviderTradeNo: providerTradeNo, QueryID: providerTradeNo, Payload: payload}
result := &bizpayment.PaymentResult{Provider: bizpayment.PaymentApple, Status: status, TradeNo: tradeNo, ProviderTradeNo: providerTradeNo, QueryID: providerTradeNo, Payload: payload}
if status != "success" {
return result, nil
}
internal/integration/payment/douyin.go
+15 -15
View File
@@ -5,7 +5,7 @@ import (
"encoding/json"
"errors"
"fmt"
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"strings"
"github.com/go-pay/gopay"
@@ -34,7 +34,7 @@ func (a *douyinAdapter) client(c map[string]any) (*douyin.Client, error) {
return client, nil
}
func (a *douyinAdapter) Create(ctx context.Context, req *system.PaymentRequest, c map[string]any) (*system.PaymentResult, error) {
func (a *douyinAdapter) Create(ctx context.Context, req *bizpayment.PaymentRequest, c map[string]any) (*bizpayment.PaymentResult, error) {
if req == nil {
return nil, errors.New("抖音支付下单请求为空")
}
@@ -77,7 +77,7 @@ func (a *douyinAdapter) Create(ctx context.Context, req *system.PaymentRequest,
return nil, errors.New("抖音支付 H5 下单响应缺少 h5_url")
}
payload, _ := json.Marshal(rsp.Response)
return &system.PaymentResult{Provider: system.PaymentDouyin, Status: "client_pending", TradeNo: req.TradeNo, Payload: payload}, nil
return &bizpayment.PaymentResult{Provider: bizpayment.PaymentDouyin, Status: "client_pending", TradeNo: req.TradeNo, Payload: payload}, nil
case "native":
rsp, callErr := client.NativeOrder(ctx, bm)
if callErr != nil {
@@ -90,7 +90,7 @@ func (a *douyinAdapter) Create(ctx context.Context, req *system.PaymentRequest,
return nil, errors.New("抖音支付 Native 下单响应缺少 code_url")
}
payload, _ := json.Marshal(rsp.Response)
return &system.PaymentResult{Provider: system.PaymentDouyin, Status: "client_pending", TradeNo: req.TradeNo, Payload: payload}, nil
return &bizpayment.PaymentResult{Provider: bizpayment.PaymentDouyin, Status: "client_pending", TradeNo: req.TradeNo, Payload: payload}, nil
case "jsapi":
rsp, callErr := client.JsapiOrder(ctx, bm)
if callErr != nil {
@@ -125,7 +125,7 @@ func douyinCreateMethod(extra, config map[string]any) (string, error) {
}
}
func douyinPrepayResult(client *douyin.Client, appID, tradeNo, prepayID string, app bool) (*system.PaymentResult, error) {
func douyinPrepayResult(client *douyin.Client, appID, tradeNo, prepayID string, app bool) (*bizpayment.PaymentResult, error) {
if client == nil || strings.TrimSpace(prepayID) == "" {
return nil, errors.New("抖音支付下单响应缺少 prepay_id")
}
@@ -141,15 +141,15 @@ func douyinPrepayResult(client *douyin.Client, appID, tradeNo, prepayID string,
if err != nil {
return nil, fmt.Errorf("生成抖音支付客户端调起参数: %w", err)
}
return &system.PaymentResult{
Provider: system.PaymentDouyin,
return &bizpayment.PaymentResult{
Provider: bizpayment.PaymentDouyin,
Status: "client_pending",
TradeNo: tradeNo,
Payload: mustJSON(params),
}, nil
}
func (a *douyinAdapter) Query(ctx context.Context, tradeNo string, c map[string]any) (*system.PaymentResult, error) {
func (a *douyinAdapter) 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")
@@ -177,7 +177,7 @@ func (a *douyinAdapter) Query(ctx context.Context, tradeNo string, c map[string]
payload = append([]byte(nil), signedBody...)
}
}
result := &system.PaymentResult{Provider: system.PaymentDouyin, Status: normalizeDouyinState(order.TradeState), TradeNo: order.OutTradeNo, ProviderTradeNo: order.TransactionId, Payload: payload}
result := &bizpayment.PaymentResult{Provider: bizpayment.PaymentDouyin, Status: normalizeDouyinState(order.TradeState), TradeNo: order.OutTradeNo, ProviderTradeNo: order.TransactionId, Payload: payload}
if result.TradeNo == "" {
result.TradeNo = tradeNo
} else if result.TradeNo != tradeNo {
@@ -189,7 +189,7 @@ func (a *douyinAdapter) Query(ctx context.Context, tradeNo string, c map[string]
return result, nil
}
func (a *douyinAdapter) Refund(ctx context.Context, req *system.PaymentRefundRequest, c map[string]any) (*system.PaymentResult, error) {
func (a *douyinAdapter) Refund(ctx context.Context, req *bizpayment.PaymentRefundRequest, c map[string]any) (*bizpayment.PaymentResult, error) {
if req == nil {
return nil, errors.New("抖音支付退款请求为空")
}
@@ -226,7 +226,7 @@ func (a *douyinAdapter) Refund(ctx context.Context, req *system.PaymentRefundReq
if err != nil {
return nil, err
}
result := &system.PaymentResult{Provider: system.PaymentDouyin, Status: normalizeRefundState(r.Status), TradeNo: tradeNo, ProviderTradeNo: refundID, Payload: mustJSON(r)}
result := &bizpayment.PaymentResult{Provider: bizpayment.PaymentDouyin, Status: normalizeRefundState(r.Status), TradeNo: tradeNo, ProviderTradeNo: refundID, Payload: mustJSON(r)}
if r.Amount == nil {
return nil, errors.New("抖音支付退款响应缺少金额")
}
@@ -277,7 +277,7 @@ func validateDouyinRefundIdentity(refund *douyin.Refund, tradeNo, refundNo strin
return refundID, nil
}
func (a *douyinAdapter) Callback(ctx context.Context, callback *system.PaymentCallback, c map[string]any) (*system.PaymentResult, error) {
func (a *douyinAdapter) Callback(ctx context.Context, callback *bizpayment.PaymentCallback, c map[string]any) (*bizpayment.PaymentResult, error) {
if callback == nil {
return nil, errors.New("抖音支付回调为空")
}
@@ -316,7 +316,7 @@ func (a *douyinAdapter) Callback(ctx context.Context, callback *system.PaymentCa
if err != nil {
return nil, err
}
result := &system.PaymentResult{Provider: system.PaymentDouyin, Status: normalizeDouyinState(pay.TradeState), TradeNo: pay.OutTradeNo, ProviderTradeNo: pay.TransactionId, Payload: append([]byte(nil), plain...), EventID: notify.Id}
result := &bizpayment.PaymentResult{Provider: bizpayment.PaymentDouyin, Status: normalizeDouyinState(pay.TradeState), TradeNo: pay.OutTradeNo, ProviderTradeNo: pay.TransactionId, Payload: append([]byte(nil), plain...), EventID: notify.Id}
if err = populateDouyinPaymentAmount(result, pay.Amount, plain); err != nil {
return nil, err
}
@@ -338,7 +338,7 @@ func (a *douyinAdapter) Callback(ctx context.Context, callback *system.PaymentCa
} else if strings.EqualFold(refund.RefundStatus, douyin.RefundStatusClosed) || strings.EqualFold(refund.RefundStatus, douyin.RefundStatusAbnormal) {
status = "failed"
}
result := &system.PaymentResult{Provider: system.PaymentDouyin, Status: status, TradeNo: refund.OutTradeNo, ProviderTradeNo: refund.RefundId, Payload: mustJSON(refund), EventID: notify.Id}
result := &bizpayment.PaymentResult{Provider: bizpayment.PaymentDouyin, Status: status, TradeNo: refund.OutTradeNo, ProviderTradeNo: refund.RefundId, Payload: mustJSON(refund), EventID: notify.Id}
if refund.Amount != nil {
result.Amount = int64(refund.Amount.Refund)
result.Currency = strings.ToUpper(firstAny(c, "currency"))
@@ -365,7 +365,7 @@ func validateDouyinMerchantIdentity(merchantID, appID string, c map[string]any,
return nil
}
func populateDouyinPaymentAmount(result *system.PaymentResult, amount *douyin.AmountInfo, raw []byte) error {
func populateDouyinPaymentAmount(result *bizpayment.PaymentResult, amount *douyin.AmountInfo, raw []byte) error {
if result == nil || amount == nil {
return nil
}
internal/integration/payment/gopay_helpers.go
+2 -2
View File
@@ -4,7 +4,7 @@ import (
"bytes"
"encoding/json"
"fmt"
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"net/http"
"strings"
@@ -15,7 +15,7 @@ import (
// The adapters in this package intentionally keep GoPay request/response
// models below the data boundary. The business layer only sees PaymentResult.
func callbackRequest(callback *system.PaymentCallback) (*http.Request, error) {
func callbackRequest(callback *bizpayment.PaymentCallback) (*http.Request, error) {
request, err := http.NewRequest(http.MethodPost, "http://payment-callback.local", bytes.NewReader(callback.Body))
if err != nil {
return nil, err
internal/integration/payment/gopay_test.go
+13 -13
View File
@@ -14,7 +14,7 @@ import (
"encoding/pem"
"fmt"
"io"
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"net/http"
"net/http/httptest"
"net/url"
@@ -125,8 +125,8 @@ func TestAlipayTradePayUsesGoPaySDK(t *testing.T) {
}))
defer server.Close()
result, err := (&alipayAdapter{}).Create(context.Background(), &system.PaymentRequest{
Provider: system.PaymentAlipay, TradeNo: "T-ALIPAY-PAY", Subject: "subject", Amount: 1000,
result, err := (&alipayAdapter{}).Create(context.Background(), &bizpayment.PaymentRequest{
Provider: bizpayment.PaymentAlipay, TradeNo: "T-ALIPAY-PAY", Subject: "subject", Amount: 1000,
Currency: "CNY", Extra: map[string]any{"method": "barcode", "auth_code": "BARCODE-1"},
}, map[string]any{
"app_id": "app-test", "private_key": privatePEM, "public_key": publicPEM, "gateway_url": server.URL,
@@ -194,7 +194,7 @@ func TestWechatV2GoPayCallbackVerificationAndSandboxAmount(t *testing.T) {
}))
defer server.Close()
result, err := (&wechatV2Adapter{}).Create(context.Background(), &system.PaymentRequest{
result, err := (&wechatV2Adapter{}).Create(context.Background(), &bizpayment.PaymentRequest{
TradeNo: "T-WECHAT", Subject: "subject", Amount: 123, Currency: "CNY", NotifyURL: "http://notify.local",
}, map[string]any{
"app_id": "wx-test", "merchant_id": "mch-test", "mch_key": key,
@@ -220,7 +220,7 @@ func TestWechatV2GoPayCallbackVerificationAndSandboxAmount(t *testing.T) {
t.Fatal("verification mutated source values")
}
callbackBody := paymentutil.XMLEncode(callbackValues)
callbackResult, err := (&wechatV2Adapter{}).Callback(context.Background(), &system.PaymentCallback{Body: callbackBody}, map[string]any{
callbackResult, err := (&wechatV2Adapter{}).Callback(context.Background(), &bizpayment.PaymentCallback{Body: callbackBody}, map[string]any{
"app_id": "wx-test", "merchant_id": "mch-test", "mch_key": key,
})
if err != nil {
@@ -267,8 +267,8 @@ func TestWechatV2MicropayUsesGoPaySDKAndValidatesIdentities(t *testing.T) {
}))
defer server.Close()
result, err := (&wechatV2Adapter{}).Create(context.Background(), &system.PaymentRequest{
Provider: system.PaymentWechatV2, TradeNo: "T-WECHAT-MICRO", Subject: "subject", Amount: 123,
result, err := (&wechatV2Adapter{}).Create(context.Background(), &bizpayment.PaymentRequest{
Provider: bizpayment.PaymentWechatV2, TradeNo: "T-WECHAT-MICRO", Subject: "subject", Amount: 123,
Currency: "CNY", NotifyURL: "http://notify.local",
Extra: map[string]any{"method": "barcode", "auth_code": "AUTH-CODE-1"},
}, map[string]any{
@@ -287,8 +287,8 @@ func TestWechatV2MicropayUsesGoPaySDKAndValidatesIdentities(t *testing.T) {
}
func TestWechatV2MicropayRejectsMissingAuthCodeAndUnknownMode(t *testing.T) {
_, err := (&wechatV2Adapter{}).Create(context.Background(), &system.PaymentRequest{
Provider: system.PaymentWechatV2, TradeNo: "T-WECHAT-MICRO-MISSING", Subject: "subject", Amount: 1,
_, err := (&wechatV2Adapter{}).Create(context.Background(), &bizpayment.PaymentRequest{
Provider: bizpayment.PaymentWechatV2, TradeNo: "T-WECHAT-MICRO-MISSING", Subject: "subject", Amount: 1,
Currency: "CNY", NotifyURL: "http://notify.local", Extra: map[string]any{"method": "micropay"},
}, map[string]any{"app_id": "wx-test", "merchant_id": "mch-test", "mch_key": "wechat-secret"})
if err == nil || !strings.Contains(err.Error(), "auth_code") {
@@ -348,8 +348,8 @@ func TestWechatV2MicropayRejectsInvalidSuccessResponse(t *testing.T) {
}))
defer server.Close()
_, err := (&wechatV2Adapter{}).Create(context.Background(), &system.PaymentRequest{
Provider: system.PaymentWechatV2, TradeNo: "T-WECHAT-MICRO", Subject: "subject", Amount: 123,
_, err := (&wechatV2Adapter{}).Create(context.Background(), &bizpayment.PaymentRequest{
Provider: bizpayment.PaymentWechatV2, TradeNo: "T-WECHAT-MICRO", Subject: "subject", Amount: 123,
Currency: "CNY", Extra: map[string]any{"method": "micropay", "auth_code": "AUTH-CODE-1"},
}, map[string]any{
"app_id": "wx-test", "merchant_id": "mch-test", "mch_key": key,
@@ -520,7 +520,7 @@ func TestDouyinPrepayResultUsesGoPayClientSigning(t *testing.T) {
if err = json.Unmarshal(result.Payload, &payload); err != nil {
t.Fatal(err)
}
if result.Provider != system.PaymentDouyin || result.TradeNo != "T-DOUYIN" || strings.TrimSpace(fmt.Sprint(payload["sign"])) == "" && strings.TrimSpace(fmt.Sprint(payload["paySign"])) == "" {
if result.Provider != bizpayment.PaymentDouyin || result.TradeNo != "T-DOUYIN" || strings.TrimSpace(fmt.Sprint(payload["sign"])) == "" && strings.TrimSpace(fmt.Sprint(payload["paySign"])) == "" {
t.Fatalf("app=%v result=%+v payload=%#v", app, result, payload)
}
if app {
@@ -581,7 +581,7 @@ func TestWechatV3GoPayCallbackVerificationAndDecryption(t *testing.T) {
t.Fatal(err)
}
signature := testRSA2Sign(t, platformKey, []byte(timestamp+"\n"+headerNonce+"\n"+string(body)+"\n"))
callback := &system.PaymentCallback{
callback := &bizpayment.PaymentCallback{
Body: body,
Headers: map[string]string{
gopayWechatV3.HeaderTimestamp: timestamp,
internal/integration/payment/identity_test.go
+6 -6
View File
@@ -12,7 +12,7 @@ import (
"encoding/json"
"encoding/pem"
"fmt"
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"net"
"net/http"
"net/http/httptest"
@@ -116,7 +116,7 @@ func TestLakalaKeepsQueryAndFinalTradeIdentitiesSeparate(t *testing.T) {
t.Fatalf("query result = %+v", result)
}
refund, err := (&lakalaAdapter{}).Refund(context.Background(), &system.PaymentRefundRequest{
refund, err := (&lakalaAdapter{}).Refund(context.Background(), &bizpayment.PaymentRefundRequest{
TradeNo: "MERCHANT-LAKALA-1", QueryID: created.QueryID,
RefundNo: "REFUND-LAKALA-1", Amount: 40, Currency: "JPY",
}, config)
@@ -216,8 +216,8 @@ func TestLakalaCreateRoutesSupportedMethods(t *testing.T) {
if tc.configMethod != "" {
config["method"] = tc.configMethod
}
result, err := adapter.Create(context.Background(), &system.PaymentRequest{
Provider: system.PaymentLakala, TradeNo: tc.tradeNo, Subject: "subject", Amount: 100,
result, err := adapter.Create(context.Background(), &bizpayment.PaymentRequest{
Provider: bizpayment.PaymentLakala, TradeNo: tc.tradeNo, Subject: "subject", Amount: 100,
Currency: "JPY", Extra: extra,
}, config)
if err != nil {
@@ -238,8 +238,8 @@ func TestLakalaCreateRoutesSupportedMethods(t *testing.T) {
}
func TestLakalaCreateRejectsUnknownMethod(t *testing.T) {
_, err := (&lakalaAdapter{}).Create(context.Background(), &system.PaymentRequest{
Provider: system.PaymentLakala, TradeNo: "L-UNKNOWN", Subject: "subject", Amount: 100,
_, err := (&lakalaAdapter{}).Create(context.Background(), &bizpayment.PaymentRequest{
Provider: bizpayment.PaymentLakala, TradeNo: "L-UNKNOWN", Subject: "subject", Amount: 100,
Currency: "JPY", Extra: map[string]any{"method": "unsupported"},
}, map[string]any{"partner_code": "PART", "credential_code": "credential", "channel": "Wechat"})
if err == nil || !strings.Contains(err.Error(), "不支持的下单方式") {
internal/integration/payment/lakala.go
+14 -14
View File
@@ -4,7 +4,7 @@ import (
"context"
"errors"
"fmt"
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"strings"
"github.com/go-pay/gopay"
@@ -17,7 +17,7 @@ func (a *lakalaAdapter) client(c map[string]any) (*lakala.Client, error) {
return lakala.NewClient(text(c, "partner_code"), text(c, "credential_code"), !strings.EqualFold(text(c, "environment"), "sandbox"))
}
func (a *lakalaAdapter) Create(ctx context.Context, req *system.PaymentRequest, c map[string]any) (*system.PaymentResult, error) {
func (a *lakalaAdapter) Create(ctx context.Context, req *bizpayment.PaymentRequest, c map[string]any) (*bizpayment.PaymentResult, error) {
if req == nil {
return nil, errors.New("拉卡拉支付下单请求为空")
}
@@ -74,7 +74,7 @@ func lakalaCreateMethod(extra, config map[string]any) string {
return strings.NewReplacer(".", "_", "-", "_", " ", "_").Replace(strings.ToLower(strings.TrimSpace(method)))
}
func lakalaCreateResult(tradeNo string, rsp *lakala.PaymentRsp) (*system.PaymentResult, error) {
func lakalaCreateResult(tradeNo string, rsp *lakala.PaymentRsp) (*bizpayment.PaymentResult, error) {
if rsp == nil || !lakalaCreateResponseOK(rsp.ReturnCode, rsp.ResultCode) {
return nil, fmt.Errorf("拉卡拉支付下单失败: %v", rsp)
}
@@ -85,10 +85,10 @@ func lakalaCreateResult(tradeNo string, rsp *lakala.PaymentRsp) (*system.Payment
if partnerOrderID := strings.TrimSpace(rsp.PartnerOrderId); partnerOrderID != "" && partnerOrderID != tradeNo {
return nil, errors.New("拉卡拉支付下单响应的商户订单号不匹配")
}
return &system.PaymentResult{Provider: system.PaymentLakala, Status: "created", TradeNo: tradeNo, QueryID: orderID, Payload: mustJSON(rsp)}, nil
return &bizpayment.PaymentResult{Provider: bizpayment.PaymentLakala, Status: "created", TradeNo: tradeNo, QueryID: orderID, Payload: mustJSON(rsp)}, nil
}
func lakalaRetailCreateResult(tradeNo string, rsp *lakala.RetailPayRsp) (*system.PaymentResult, error) {
func lakalaRetailCreateResult(tradeNo string, rsp *lakala.RetailPayRsp) (*bizpayment.PaymentResult, error) {
if rsp == nil || !lakalaRetailCreateResponseOK(rsp.ReturnCode, rsp.ResultCode) {
return nil, fmt.Errorf("拉卡拉线下支付下单失败: %v", rsp)
}
@@ -99,15 +99,15 @@ func lakalaRetailCreateResult(tradeNo string, rsp *lakala.RetailPayRsp) (*system
if partnerOrderID := strings.TrimSpace(rsp.PartnerOrderId); partnerOrderID != "" && partnerOrderID != tradeNo {
return nil, errors.New("拉卡拉线下支付下单响应的商户订单号不匹配")
}
result := &system.PaymentResult{
Provider: system.PaymentLakala, Status: "created", TradeNo: tradeNo,
result := &bizpayment.PaymentResult{
Provider: bizpayment.PaymentLakala, Status: "created", TradeNo: tradeNo,
QueryID: orderID, Amount: int64(rsp.TotalFee), Currency: strings.ToUpper(rsp.Currency),
Payload: mustJSON(rsp),
}
return result, nil
}
func (a *lakalaAdapter) Query(ctx context.Context, tradeNo string, c map[string]any) (*system.PaymentResult, error) {
func (a *lakalaAdapter) Query(ctx context.Context, tradeNo string, c map[string]any) (*bizpayment.PaymentResult, error) {
client, err := a.client(c)
if err != nil {
return nil, err
@@ -131,7 +131,7 @@ func (a *lakalaAdapter) Query(ctx context.Context, tradeNo string, c map[string]
if returnedTradeNo == "" {
return nil, errors.New("拉卡拉支付查单响应缺少商户订单号")
}
result := &system.PaymentResult{Provider: system.PaymentLakala, Status: status, TradeNo: returnedTradeNo, ProviderTradeNo: strings.TrimSpace(rsp.ChannelOrderId), QueryID: orderID, Amount: int64(rsp.TotalFee), Currency: strings.ToUpper(rsp.Currency), Payload: mustJSON(rsp)}
result := &bizpayment.PaymentResult{Provider: bizpayment.PaymentLakala, Status: status, TradeNo: returnedTradeNo, ProviderTradeNo: strings.TrimSpace(rsp.ChannelOrderId), QueryID: orderID, Amount: int64(rsp.TotalFee), Currency: strings.ToUpper(rsp.Currency), Payload: mustJSON(rsp)}
if result.Currency == "" {
result.Currency = strings.ToUpper(firstAny(c, "currency", "default_currency"))
}
@@ -149,7 +149,7 @@ func (a *lakalaAdapter) Query(ctx context.Context, tradeNo string, c map[string]
return result, nil
}
func (a *lakalaAdapter) Refund(ctx context.Context, req *system.PaymentRefundRequest, c map[string]any) (*system.PaymentResult, error) {
func (a *lakalaAdapter) Refund(ctx context.Context, req *bizpayment.PaymentRefundRequest, c map[string]any) (*bizpayment.PaymentResult, error) {
if req == nil {
return nil, errors.New("拉卡拉支付退款请求为空")
}
@@ -181,7 +181,7 @@ func (a *lakalaAdapter) Refund(ctx context.Context, req *system.PaymentRefundReq
return lakalaRefundResult(&effective, rsp)
}
func lakalaRefundResult(req *system.PaymentRefundRequest, rsp *lakala.RefundRsp) (*system.PaymentResult, error) {
func lakalaRefundResult(req *bizpayment.PaymentRefundRequest, rsp *lakala.RefundRsp) (*bizpayment.PaymentResult, error) {
if rsp == nil || !lakalaRefundResponseOK(rsp.ReturnCode, rsp.ResultCode) {
return nil, fmt.Errorf("拉卡拉支付退款失败: %v", rsp)
}
@@ -204,10 +204,10 @@ func lakalaRefundResult(req *system.PaymentRefundRequest, rsp *lakala.RefundRsp)
} else if requestCurrency != "" && currency != requestCurrency {
return nil, errors.New("拉卡拉支付退款响应币种不匹配")
}
return &system.PaymentResult{Provider: system.PaymentLakala, Status: normalizeLakalaRefundState(rsp.ResultCode), TradeNo: req.TradeNo, ProviderTradeNo: providerRefundID, Amount: int64(rsp.Amount), Currency: currency, Payload: mustJSON(rsp)}, nil
return &bizpayment.PaymentResult{Provider: bizpayment.PaymentLakala, Status: normalizeLakalaRefundState(rsp.ResultCode), TradeNo: req.TradeNo, ProviderTradeNo: providerRefundID, Amount: int64(rsp.Amount), Currency: currency, Payload: mustJSON(rsp)}, nil
}
func (a *lakalaAdapter) Callback(_ context.Context, callback *system.PaymentCallback, c map[string]any) (*system.PaymentResult, error) {
func (a *lakalaAdapter) Callback(_ context.Context, callback *bizpayment.PaymentCallback, c map[string]any) (*bizpayment.PaymentResult, error) {
if callback == nil {
return nil, errors.New("拉卡拉支付回调为空")
}
@@ -222,5 +222,5 @@ func (a *lakalaAdapter) Callback(_ context.Context, callback *system.PaymentCall
if err := lakala.VerifySign(notify, text(c, "partner_code"), text(c, "credential_code")); err != nil {
return nil, err
}
return &system.PaymentResult{Provider: system.PaymentLakala, Status: "success", TradeNo: notify.PartnerOrderId, ProviderTradeNo: strings.TrimSpace(notify.ChannelOrderId), QueryID: strings.TrimSpace(notify.OrderId), Amount: int64(notify.TotalFee), Currency: strings.ToUpper(notify.Currency), Payload: mustJSON(notify)}, nil
return &bizpayment.PaymentResult{Provider: bizpayment.PaymentLakala, Status: "success", TradeNo: notify.PartnerOrderId, ProviderTradeNo: strings.TrimSpace(notify.ChannelOrderId), QueryID: strings.TrimSpace(notify.OrderId), Amount: int64(notify.TotalFee), Currency: strings.ToUpper(notify.Currency), Payload: mustJSON(notify)}, nil
}
internal/integration/payment/lakala_test.go
+3 -3
View File
@@ -1,7 +1,7 @@
package payment
import (
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"testing"
"github.com/go-pay/gopay/lakala"
@@ -58,7 +58,7 @@ func TestLakalaQueryStateMapping(t *testing.T) {
}
func TestLakalaRefundResultBindsRefundIdentity(t *testing.T) {
req := &system.PaymentRefundRequest{TradeNo: "LOCAL-1", RefundNo: "REFUND-1", Amount: 50, Currency: "JPY"}
req := &bizpayment.PaymentRefundRequest{TradeNo: "LOCAL-1", RefundNo: "REFUND-1", Amount: 50, Currency: "JPY"}
base := func() *lakala.RefundRsp {
return &lakala.RefundRsp{
ErrorCode: lakala.ErrorCode{ReturnCode: "SUCCESS", ResultCode: "SUCCESS"},
@@ -98,7 +98,7 @@ func TestLakalaRefundResultBindsRefundIdentity(t *testing.T) {
}
func TestLakalaRefundResultMapsProviderState(t *testing.T) {
req := &system.PaymentRefundRequest{TradeNo: "LOCAL-1", RefundNo: "REFUND-1", Amount: 50, Currency: "JPY"}
req := &bizpayment.PaymentRefundRequest{TradeNo: "LOCAL-1", RefundNo: "REFUND-1", Amount: 50, Currency: "JPY"}
for _, tc := range []struct {
code string
want string
internal/integration/payment/native_test.go
+5 -5
View File
@@ -4,7 +4,7 @@ import (
"crypto/aes"
"crypto/cipher"
"encoding/base64"
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"net/url"
"strings"
"testing"
@@ -94,7 +94,7 @@ func TestAlipaySignContentSortedAndExcludesSign(t *testing.T) {
}
func TestAlipayBreakdownWithPointPayment(t *testing.T) {
result := &system.PaymentResult{Status: "success", Amount: 1000}
result := &bizpayment.PaymentResult{Status: "success", Amount: 1000}
err := populateAlipayBreakdown(result, map[string]any{
"total_amount": "10.00", "buyer_pay_amount": "8.00", "point_amount": "2.00", "receipt_amount": "8.00",
})
@@ -107,7 +107,7 @@ func TestAlipayBreakdownWithPointPayment(t *testing.T) {
}
func TestWechatV2BreakdownWithCoupon(t *testing.T) {
result := &system.PaymentResult{Status: "success", Amount: 1000}
result := &bizpayment.PaymentResult{Status: "success", Amount: 1000}
err := populateWechatV2Breakdown(result, map[string]string{"cash_fee": "900", "coupon_fee": "100", "settlement_total_fee": "950"})
if err != nil {
t.Fatal(err)
@@ -118,7 +118,7 @@ func TestWechatV2BreakdownWithCoupon(t *testing.T) {
}
func TestWechatV3BreakdownWithPromotion(t *testing.T) {
result := &system.PaymentResult{Status: "success", Amount: 1000}
result := &bizpayment.PaymentResult{Status: "success", Amount: 1000}
err := populateWechatV3Breakdown(result, map[string]any{
"amount": map[string]any{"payer_total": float64(800), "settlement_amount": float64(780)},
"promotion_detail": []any{map[string]any{"amount": float64(200)}},
@@ -132,7 +132,7 @@ func TestWechatV3BreakdownWithPromotion(t *testing.T) {
}
func TestVendorBreakdownUsesConfiguredUnits(t *testing.T) {
result := &system.PaymentResult{Status: "success", Amount: 1000, Currency: "CNY"}
result := &bizpayment.PaymentResult{Status: "success", Amount: 1000, Currency: "CNY"}
object := map[string]any{"data": map[string]any{
"payer": "8.00", "cash": "6.00", "points": "2.00", "discount": "2.00", "settlement": "7.80",
}}
internal/integration/payment/paypal.go
+18 -18
View File
@@ -5,7 +5,7 @@ import (
"encoding/json"
"errors"
"fmt"
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"math"
"strconv"
"strings"
@@ -31,7 +31,7 @@ func (a *paypalAdapter) client(c map[string]any) (*paypal.Client, error) {
return client, nil
}
func (a *paypalAdapter) Create(ctx context.Context, req *system.PaymentRequest, c map[string]any) (*system.PaymentResult, error) {
func (a *paypalAdapter) Create(ctx context.Context, req *bizpayment.PaymentRequest, c map[string]any) (*bizpayment.PaymentResult, error) {
if req == nil {
return nil, errors.New("PayPal 下单参数为空")
}
@@ -74,7 +74,7 @@ func (a *paypalAdapter) Create(ctx context.Context, req *system.PaymentRequest,
return paypalCreateResult(req, order, c)
}
func (a *paypalAdapter) Query(ctx context.Context, orderID string, c map[string]any) (*system.PaymentResult, error) {
func (a *paypalAdapter) Query(ctx context.Context, orderID string, c map[string]any) (*bizpayment.PaymentResult, error) {
orderID = strings.TrimSpace(orderID)
if orderID == "" {
return nil, errors.New("PayPal 查单缺少 order ID")
@@ -153,7 +153,7 @@ func paypalAutoCaptureEnabled(c map[string]any) bool {
return true
}
func (a *paypalAdapter) Refund(ctx context.Context, req *system.PaymentRefundRequest, c map[string]any) (*system.PaymentResult, error) {
func (a *paypalAdapter) Refund(ctx context.Context, req *bizpayment.PaymentRefundRequest, c map[string]any) (*bizpayment.PaymentResult, error) {
if req == nil {
return nil, errors.New("PayPal 退款请求为空")
}
@@ -201,7 +201,7 @@ func (a *paypalAdapter) Refund(ctx context.Context, req *system.PaymentRefundReq
return paypalRefundResult(req, rsp.Response, c)
}
func paypalRefundResult(req *system.PaymentRefundRequest, refund *paypal.PaymentCaptureRefund, c map[string]any) (*system.PaymentResult, error) {
func paypalRefundResult(req *bizpayment.PaymentRefundRequest, refund *paypal.PaymentCaptureRefund, c map[string]any) (*bizpayment.PaymentResult, error) {
if req == nil || refund == nil {
return nil, errors.New("PayPal 退款响应为空")
}
@@ -215,8 +215,8 @@ func paypalRefundResult(req *system.PaymentRefundRequest, refund *paypal.Payment
return nil, errors.New("PayPal 退款响应缺少 refund ID")
}
currency := strings.ToUpper(strings.TrimSpace(req.Currency))
result := &system.PaymentResult{
Provider: system.PaymentPayPal,
result := &bizpayment.PaymentResult{
Provider: bizpayment.PaymentPayPal,
Status: normalizePayPalRefundState(refund.Status),
TradeNo: req.TradeNo,
ProviderTradeNo: providerRefundID,
@@ -246,7 +246,7 @@ func paypalRefundResult(req *system.PaymentRefundRequest, refund *paypal.Payment
return result, nil
}
func paypalCreateResult(req *system.PaymentRequest, order *paypal.OrderDetail, c map[string]any) (*system.PaymentResult, error) {
func paypalCreateResult(req *bizpayment.PaymentRequest, order *paypal.OrderDetail, c map[string]any) (*bizpayment.PaymentResult, error) {
if req == nil || order == nil {
return nil, errors.New("PayPal 下单响应为空")
}
@@ -277,7 +277,7 @@ func paypalCreateResult(req *system.PaymentRequest, order *paypal.OrderDetail, c
return result, nil
}
func (a *paypalAdapter) Callback(ctx context.Context, callback *system.PaymentCallback, c map[string]any) (*system.PaymentResult, error) {
func (a *paypalAdapter) Callback(ctx context.Context, callback *bizpayment.PaymentCallback, c map[string]any) (*bizpayment.PaymentResult, error) {
if callback == nil || len(callback.Body) == 0 {
return nil, errors.New("PayPal 回调为空")
}
@@ -325,7 +325,7 @@ func (a *paypalAdapter) Callback(ctx context.Context, callback *system.PaymentCa
return result, nil
}
func paypalApplicationContext(req *system.PaymentRequest, c map[string]any) map[string]any {
func paypalApplicationContext(req *bizpayment.PaymentRequest, c map[string]any) map[string]any {
applicationContext := map[string]any{}
if configured, ok := req.Extra["application_context"].(map[string]any); ok {
for key, value := range configured {
@@ -352,7 +352,7 @@ func paypalApplicationContext(req *system.PaymentRequest, c map[string]any) map[
return applicationContext
}
func paypalOrderResult(order *paypal.OrderDetail, queryID, fallbackTradeNo string, c map[string]any) (*system.PaymentResult, error) {
func paypalOrderResult(order *paypal.OrderDetail, queryID, fallbackTradeNo string, c map[string]any) (*bizpayment.PaymentResult, error) {
if order == nil {
return nil, errors.New("PayPal 订单结果为空")
}
@@ -364,8 +364,8 @@ func paypalOrderResult(order *paypal.OrderDetail, queryID, fallbackTradeNo strin
tradeNo = fallbackTradeNo
}
capture := paypalOrderCapture(order)
result := &system.PaymentResult{
Provider: system.PaymentPayPal,
result := &bizpayment.PaymentResult{
Provider: bizpayment.PaymentPayPal,
Status: paypalOrderCaptureState(order),
TradeNo: tradeNo,
QueryID: queryID,
@@ -498,7 +498,7 @@ func paypalOrderAmount(order *paypal.OrderDetail, c map[string]any) (int64, stri
return total, currency, found, nil
}
func paypalRefundCaptureID(ctx context.Context, client *paypal.Client, req *system.PaymentRefundRequest) (string, error) {
func paypalRefundCaptureID(ctx context.Context, client *paypal.Client, req *bizpayment.PaymentRefundRequest) (string, error) {
if req == nil {
return "", errors.New("PayPal 退款请求为空")
}
@@ -533,7 +533,7 @@ func paypalRefundCaptureID(ctx context.Context, client *paypal.Client, req *syst
return capture.Id, nil
}
func paypalWebhookResult(event *paypal.WebhookEvent) (*system.PaymentResult, error) {
func paypalWebhookResult(event *paypal.WebhookEvent) (*bizpayment.PaymentResult, error) {
var resource map[string]any
if err := json.Unmarshal(event.Resource, &resource); err != nil {
return nil, fmt.Errorf("PayPal 回调 resource 无效: %w", err)
@@ -567,8 +567,8 @@ func paypalWebhookResult(event *paypal.WebhookEvent) (*system.PaymentResult, err
if tradeNo == "" || queryID == "" {
return nil, errors.New("PayPal 回调缺少商户订单号或 order ID")
}
return &system.PaymentResult{
Provider: system.PaymentPayPal,
return &bizpayment.PaymentResult{
Provider: bizpayment.PaymentPayPal,
Status: status,
TradeNo: tradeNo,
ProviderTradeNo: providerTradeNo,
@@ -587,7 +587,7 @@ func paypalPurchaseUnitTradeNo(resource map[string]any) string {
return ""
}
func paypalCallbackHeader(callback *system.PaymentCallback, name string) string {
func paypalCallbackHeader(callback *bizpayment.PaymentCallback, name string) string {
for key, value := range callback.Headers {
if strings.EqualFold(key, name) {
return strings.TrimSpace(value)
internal/integration/payment/paypal_test.go
+11 -11
View File
@@ -3,7 +3,7 @@ package payment
import (
"context"
"encoding/json"
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"net/http"
"net/http/httptest"
"strings"
@@ -51,7 +51,7 @@ func TestPayPalCreateAndQueryKeepOrderAndCaptureIDsSeparate(t *testing.T) {
adapter := &paypalAdapter{}
config := paypalTestConfig(server.URL)
created, err := adapter.Create(context.Background(), &system.PaymentRequest{
created, err := adapter.Create(context.Background(), &bizpayment.PaymentRequest{
TradeNo: "LOCAL-1",
Subject: "Order one",
Amount: 1099,
@@ -142,7 +142,7 @@ func TestPayPalCreateRejectsMismatchedResponseIdentityAndAmount(t *testing.T) {
}))
defer server.Close()
_, err := (&paypalAdapter{}).Create(context.Background(), &system.PaymentRequest{
_, err := (&paypalAdapter{}).Create(context.Background(), &bizpayment.PaymentRequest{
TradeNo: "LOCAL-1", Subject: "Order one", Amount: 1099, Currency: "USD",
}, paypalTestConfig(server.URL))
if err == nil || !strings.Contains(err.Error(), tc.want) {
@@ -242,8 +242,8 @@ func TestPayPalRefundUsesPersistedCaptureID(t *testing.T) {
config := paypalTestConfig(server.URL)
config["provider_trade_no"] = "WRONG-CONFIG-CAPTURE"
result, err := (&paypalAdapter{}).Refund(context.Background(), &system.PaymentRefundRequest{
Provider: system.PaymentPayPal, TradeNo: "LOCAL-1", ProviderTradeNo: "CAPTURE-1",
result, err := (&paypalAdapter{}).Refund(context.Background(), &bizpayment.PaymentRefundRequest{
Provider: bizpayment.PaymentPayPal, TradeNo: "LOCAL-1", ProviderTradeNo: "CAPTURE-1",
QueryID: "ORDER-1", RefundNo: "REFUND-1", Amount: 123, TotalAmount: 1099, Currency: "USD",
}, config)
if err != nil {
@@ -286,8 +286,8 @@ func TestPayPalRefundResolvesCaptureFromPersistedQueryID(t *testing.T) {
config := paypalTestConfig(server.URL)
config["capture_id"] = "WRONG-CONFIG-CAPTURE"
result, err := (&paypalAdapter{}).Refund(context.Background(), &system.PaymentRefundRequest{
Provider: system.PaymentPayPal, TradeNo: "LOCAL-1", QueryID: "ORDER-1",
result, err := (&paypalAdapter{}).Refund(context.Background(), &bizpayment.PaymentRefundRequest{
Provider: bizpayment.PaymentPayPal, TradeNo: "LOCAL-1", QueryID: "ORDER-1",
RefundNo: "REFUND-2", Amount: 123, TotalAmount: 1099, Currency: "USD",
}, config)
if err != nil {
@@ -301,8 +301,8 @@ func TestPayPalRefundResolvesCaptureFromPersistedQueryID(t *testing.T) {
func TestPayPalRefundRejectsStaticCaptureIDWithoutDurableIdentity(t *testing.T) {
config := paypalTestConfig("https://paypal.invalid")
config["capture_id"] = "CONFIG-CAPTURE"
_, err := (&paypalAdapter{}).Refund(context.Background(), &system.PaymentRefundRequest{
Provider: system.PaymentPayPal, TradeNo: "LOCAL-1", RefundNo: "REFUND-1", Amount: 123, Currency: "USD",
_, err := (&paypalAdapter{}).Refund(context.Background(), &bizpayment.PaymentRefundRequest{
Provider: bizpayment.PaymentPayPal, TradeNo: "LOCAL-1", RefundNo: "REFUND-1", Amount: 123, Currency: "USD",
}, config)
if err == nil {
t.Fatal("Refund() accepted a static config capture ID")
@@ -310,7 +310,7 @@ func TestPayPalRefundRejectsStaticCaptureIDWithoutDurableIdentity(t *testing.T)
}
func TestPayPalRefundResultBindsRefundIdentity(t *testing.T) {
req := &system.PaymentRefundRequest{TradeNo: "LOCAL-1", RefundNo: "REFUND-1", Amount: 123, Currency: "USD"}
req := &bizpayment.PaymentRefundRequest{TradeNo: "LOCAL-1", RefundNo: "REFUND-1", Amount: 123, Currency: "USD"}
base := func() *paypal.PaymentCaptureRefund {
return &paypal.PaymentCaptureRefund{
Id: "PAYPAL-REFUND-1", InvoiceId: "REFUND-1", Status: "PENDING",
@@ -367,7 +367,7 @@ func TestPayPalCallbackUsesGoPayWebhookVerification(t *testing.T) {
}`)
config := paypalTestConfig(server.URL)
config["webhook_id"] = "HOOK-1"
result, err := (&paypalAdapter{}).Callback(context.Background(), &system.PaymentCallback{
result, err := (&paypalAdapter{}).Callback(context.Background(), &bizpayment.PaymentCallback{
Body: body,
Headers: map[string]string{
"Paypal-Auth-Algo": "SHA256withRSA",
internal/integration/payment/qq.go
+10 -10
View File
@@ -5,7 +5,7 @@ import (
"encoding/json"
"errors"
"fmt"
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"strings"
"github.com/go-pay/gopay"
@@ -60,7 +60,7 @@ func verifyQQResponse(apiKey, signType string, response any) error {
return nil
}
func (a *qqAdapter) Create(ctx context.Context, req *system.PaymentRequest, c map[string]any) (*system.PaymentResult, error) {
func (a *qqAdapter) Create(ctx context.Context, req *bizpayment.PaymentRequest, c map[string]any) (*bizpayment.PaymentResult, error) {
if req == nil {
return nil, errors.New("QQ 支付下单请求为空")
}
@@ -103,7 +103,7 @@ func (a *qqAdapter) Create(ctx context.Context, req *system.PaymentRequest, c ma
if status == "pending" && strings.EqualFold(rsp.ResultCode, "SUCCESS") && strings.TrimSpace(rsp.TransactionId) != "" {
status = "success"
}
return &system.PaymentResult{Provider: system.PaymentQQ, Status: status, TradeNo: firstNonEmptyQQ(rsp.OutTradeNo, req.TradeNo), ProviderTradeNo: strings.TrimSpace(rsp.TransactionId), Payload: mustJSON(rsp)}, nil
return &bizpayment.PaymentResult{Provider: bizpayment.PaymentQQ, Status: status, TradeNo: firstNonEmptyQQ(rsp.OutTradeNo, req.TradeNo), ProviderTradeNo: strings.TrimSpace(rsp.TransactionId), Payload: mustJSON(rsp)}, nil
}
bm.Set("trade_type", tradeType)
mergeGoPayExtras(bm, req.Extra, "nonce_str", "body", "out_trade_no", "total_fee", "spbill_create_ip", "notify_url", "trade_type", "mch_id", "sign_type")
@@ -117,7 +117,7 @@ func (a *qqAdapter) Create(ctx context.Context, req *system.PaymentRequest, c ma
if rsp == nil || !qqOK(rsp.ReturnCode, rsp.ResultCode) {
return nil, fmt.Errorf("QQ 支付下单失败: %s", first(rspMap(rsp), "return_msg", "ret_msg", "err_code_des"))
}
result := &system.PaymentResult{Provider: system.PaymentQQ, Status: "created", TradeNo: req.TradeNo, Payload: mustJSON(rsp)}
result := &bizpayment.PaymentResult{Provider: bizpayment.PaymentQQ, Status: "created", TradeNo: req.TradeNo, Payload: mustJSON(rsp)}
return result, nil
}
@@ -152,7 +152,7 @@ func firstNonEmptyQQ(values ...string) string {
return ""
}
func (a *qqAdapter) Query(ctx context.Context, tradeNo string, c map[string]any) (*system.PaymentResult, error) {
func (a *qqAdapter) Query(ctx context.Context, tradeNo string, c map[string]any) (*bizpayment.PaymentResult, error) {
tradeNo = strings.TrimSpace(tradeNo)
if tradeNo == "" {
return nil, errors.New("QQ 支付查单缺少 out_trade_no")
@@ -177,7 +177,7 @@ func (a *qqAdapter) Query(ctx context.Context, tradeNo string, c map[string]any)
if rsp == nil || !qqOK(rsp.ReturnCode, rsp.ResultCode) {
return nil, fmt.Errorf("QQ 支付查单失败: %s", first(rspMap(rsp), "return_msg", "ret_msg", "err_code_des"))
}
result := &system.PaymentResult{Provider: system.PaymentQQ, Status: normalizeQQState(rsp.TradeState), TradeNo: rsp.OutTradeNo, ProviderTradeNo: rsp.TransactionId, Payload: mustJSON(rsp)}
result := &bizpayment.PaymentResult{Provider: bizpayment.PaymentQQ, Status: normalizeQQState(rsp.TradeState), TradeNo: rsp.OutTradeNo, ProviderTradeNo: rsp.TransactionId, Payload: mustJSON(rsp)}
if result.TradeNo == "" {
result.TradeNo = tradeNo
} else if strings.TrimSpace(result.TradeNo) != tradeNo {
@@ -204,7 +204,7 @@ func (a *qqAdapter) Query(ctx context.Context, tradeNo string, c map[string]any)
return result, nil
}
func (a *qqAdapter) Refund(ctx context.Context, req *system.PaymentRefundRequest, c map[string]any) (*system.PaymentResult, error) {
func (a *qqAdapter) Refund(ctx context.Context, req *bizpayment.PaymentRefundRequest, c map[string]any) (*bizpayment.PaymentResult, error) {
if req == nil {
return nil, errors.New("QQ 支付退款请求为空")
}
@@ -268,7 +268,7 @@ func (a *qqAdapter) Refund(ctx context.Context, req *system.PaymentRefundRequest
if returnedTradeNo == "" {
returnedTradeNo = tradeNo
}
return &system.PaymentResult{Provider: system.PaymentQQ, Status: "pending", TradeNo: returnedTradeNo, ProviderTradeNo: strings.TrimSpace(rsp.RefundId), Amount: refundAmount, Currency: strings.ToUpper(req.Currency), Payload: mustJSON(rsp)}, nil
return &bizpayment.PaymentResult{Provider: bizpayment.PaymentQQ, Status: "pending", TradeNo: returnedTradeNo, ProviderTradeNo: strings.TrimSpace(rsp.RefundId), Amount: refundAmount, Currency: strings.ToUpper(req.Currency), Payload: mustJSON(rsp)}, nil
}
func validateQQRefundIdentity(tradeNo, refundNo string, rsp *gopayQQ.RefundResponse) error {
@@ -289,7 +289,7 @@ func validateQQRefundIdentity(tradeNo, refundNo string, rsp *gopayQQ.RefundRespo
return nil
}
func (a *qqAdapter) Callback(_ context.Context, callback *system.PaymentCallback, c map[string]any) (*system.PaymentResult, error) {
func (a *qqAdapter) Callback(_ context.Context, callback *bizpayment.PaymentCallback, c map[string]any) (*bizpayment.PaymentResult, error) {
if callback == nil {
return nil, errors.New("QQ 支付回调为空")
}
@@ -318,5 +318,5 @@ func (a *qqAdapter) Callback(_ context.Context, callback *system.PaymentCallback
status = "success"
}
payload, _ := json.Marshal(values)
return &system.PaymentResult{Provider: system.PaymentQQ, Status: status, TradeNo: values["out_trade_no"], ProviderTradeNo: values["transaction_id"], Payload: payload}, nil
return &bizpayment.PaymentResult{Provider: bizpayment.PaymentQQ, Status: status, TradeNo: values["out_trade_no"], ProviderTradeNo: values["transaction_id"], Payload: payload}, nil
}
internal/integration/payment/qq_test.go
+3 -3
View File
@@ -6,7 +6,7 @@ import (
"encoding/json"
"fmt"
"io"
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"net"
"net/http"
"net/http/httptest"
@@ -84,14 +84,14 @@ func TestQQCreateKeepsClientPaymentDataOutOfDurableIdentities(t *testing.T) {
_, _ = w.Write(paymentutil.XMLEncode(encoded))
}))
result, err := (&qqAdapter{}).Create(context.Background(), &system.PaymentRequest{
result, err := (&qqAdapter{}).Create(context.Background(), &bizpayment.PaymentRequest{
TradeNo: "MERCHANT-QQ-1", Subject: "subject", Amount: 100,
Currency: "CNY", ClientIP: "127.0.0.1", NotifyURL: "https://merchant.example/qq/notify",
}, map[string]any{"mch_id": "QQ-MERCHANT", "api_key": "qq-api-key"})
if err != nil {
t.Fatal(err)
}
if result.Provider != system.PaymentQQ || result.Status != "created" || result.TradeNo != "MERCHANT-QQ-1" {
if result.Provider != bizpayment.PaymentQQ || result.Status != "created" || result.TradeNo != "MERCHANT-QQ-1" {
t.Fatalf("create result = %+v", result)
}
if result.QueryID != "" || result.ProviderTradeNo != "" {
internal/integration/payment/refund_boundary_test.go
+15 -15
View File
@@ -2,7 +2,7 @@ package payment
import (
"context"
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"strings"
"testing"
@@ -15,12 +15,12 @@ import (
func TestWechatV2RefundRejectsInvalidRequestBeforeClient(t *testing.T) {
for _, tc := range []struct {
name string
req *system.PaymentRefundRequest
req *bizpayment.PaymentRefundRequest
want string
}{
{name: "blank trade number", req: &system.PaymentRefundRequest{TradeNo: " ", RefundNo: "R1", Amount: 1, TotalAmount: 1}, want: "out_trade_no"},
{name: "blank refund number", req: &system.PaymentRefundRequest{TradeNo: "T1", RefundNo: " ", Amount: 1, TotalAmount: 1}, want: "out_refund_no"},
{name: "invalid amount", req: &system.PaymentRefundRequest{TradeNo: "T1", RefundNo: "R1", Amount: 2, TotalAmount: 1}, want: "金额"},
{name: "blank trade number", req: &bizpayment.PaymentRefundRequest{TradeNo: " ", RefundNo: "R1", Amount: 1, TotalAmount: 1}, want: "out_trade_no"},
{name: "blank refund number", req: &bizpayment.PaymentRefundRequest{TradeNo: "T1", RefundNo: " ", Amount: 1, TotalAmount: 1}, want: "out_refund_no"},
{name: "invalid amount", req: &bizpayment.PaymentRefundRequest{TradeNo: "T1", RefundNo: "R1", Amount: 2, TotalAmount: 1}, want: "金额"},
} {
t.Run(tc.name, func(t *testing.T) {
_, err := (&wechatV2Adapter{}).Refund(context.Background(), tc.req, nil)
@@ -60,12 +60,12 @@ func TestWechatV2RefundIdentityValidation(t *testing.T) {
func TestQQRefundRejectsInvalidRequestBeforeClient(t *testing.T) {
for _, tc := range []struct {
name string
req *system.PaymentRefundRequest
req *bizpayment.PaymentRefundRequest
want string
}{
{name: "blank trade number", req: &system.PaymentRefundRequest{TradeNo: " ", RefundNo: "R1", Amount: 1}, want: "out_trade_no"},
{name: "blank refund number", req: &system.PaymentRefundRequest{TradeNo: "T1", RefundNo: " ", Amount: 1}, want: "out_refund_no"},
{name: "invalid amount", req: &system.PaymentRefundRequest{TradeNo: "T1", RefundNo: "R1", Amount: 0}, want: "金额"},
{name: "blank trade number", req: &bizpayment.PaymentRefundRequest{TradeNo: " ", RefundNo: "R1", Amount: 1}, want: "out_trade_no"},
{name: "blank refund number", req: &bizpayment.PaymentRefundRequest{TradeNo: "T1", RefundNo: " ", Amount: 1}, want: "out_refund_no"},
{name: "invalid amount", req: &bizpayment.PaymentRefundRequest{TradeNo: "T1", RefundNo: "R1", Amount: 0}, want: "金额"},
} {
t.Run(tc.name, func(t *testing.T) {
_, err := (&qqAdapter{}).Refund(context.Background(), tc.req, nil)
@@ -105,12 +105,12 @@ func TestQQRefundIdentityValidation(t *testing.T) {
func TestSaobeiRefundRejectsInvalidRequestBeforeClient(t *testing.T) {
for _, tc := range []struct {
name string
req *system.PaymentRefundRequest
req *bizpayment.PaymentRefundRequest
want string
}{
{name: "blank trade number", req: &system.PaymentRefundRequest{TradeNo: " ", RefundNo: "R1", Amount: 1}, want: "商户订单号"},
{name: "blank refund number", req: &system.PaymentRefundRequest{TradeNo: "T1", RefundNo: " ", Amount: 1}, want: "退款单号"},
{name: "invalid amount", req: &system.PaymentRefundRequest{TradeNo: "T1", RefundNo: "R1", Amount: 0}, want: "金额"},
{name: "blank trade number", req: &bizpayment.PaymentRefundRequest{TradeNo: " ", RefundNo: "R1", Amount: 1}, want: "商户订单号"},
{name: "blank refund number", req: &bizpayment.PaymentRefundRequest{TradeNo: "T1", RefundNo: " ", Amount: 1}, want: "退款单号"},
{name: "invalid amount", req: &bizpayment.PaymentRefundRequest{TradeNo: "T1", RefundNo: "R1", Amount: 0}, want: "金额"},
} {
t.Run(tc.name, func(t *testing.T) {
clientCreated := false
@@ -133,7 +133,7 @@ func TestSaobeiRefundRejectsMismatchedRefundNumber(t *testing.T) {
adapter := newSaobeiTestAdapter(&saobeiClientStub{refund: func(context.Context, gopay.BodyMap) (*saobei.RefundRsp, error) {
return &saobei.RefundRsp{RspBase: saobei.RspBase{ReturnCode: "01", ResultCode: "01"}, TerminalTrace: "OTHER", OutRefundNo: "SAOBEI-REFUND-1", RefundFee: "25"}, nil
}})
_, err := adapter.Refund(context.Background(), &system.PaymentRefundRequest{TradeNo: "T1", RefundNo: "R1", Amount: 25}, nil)
_, err := adapter.Refund(context.Background(), &bizpayment.PaymentRefundRequest{TradeNo: "T1", RefundNo: "R1", Amount: 25}, nil)
if err == nil || !strings.Contains(err.Error(), "terminal_trace") {
t.Fatalf("Refund() error = %v", err)
}
@@ -143,7 +143,7 @@ func TestSaobeiBarcodeCreateTreatsPayingAsPending(t *testing.T) {
adapter := newSaobeiTestAdapter(&saobeiClientStub{barcodePay: func(context.Context, gopay.BodyMap) (*saobei.BarcodePayRsp, error) {
return &saobei.BarcodePayRsp{RspBase: saobei.RspBase{ReturnCode: "01", ResultCode: saobei.ResultCodePaying}, OutTradeNo: "SAOBEI-ORDER-1"}, nil
}})
result, err := adapter.Create(context.Background(), &system.PaymentRequest{TradeNo: "LOCAL-1", Amount: 10, Extra: map[string]any{"method": "barcode", "auth_no": "AUTH-1"}}, nil)
result, err := adapter.Create(context.Background(), &bizpayment.PaymentRequest{TradeNo: "LOCAL-1", Amount: 10, Extra: map[string]any{"method": "barcode", "auth_no": "AUTH-1"}}, nil)
if err != nil {
t.Fatalf("Create() error = %v", err)
}
internal/integration/payment/response_validation_test.go
+5 -5
View File
@@ -1,7 +1,7 @@
package payment
import (
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"strings"
"testing"
@@ -28,7 +28,7 @@ func TestWechatV2ResponseRequiresBusinessSuccessCode(t *testing.T) {
func TestPopulateDouyinPaymentAmountUsesSignedFieldPresence(t *testing.T) {
amount := &douyin.AmountInfo{Total: 100, PayerTotal: 0, Currency: "CNY", PayerCurrency: "CNY"}
result := &system.PaymentResult{}
result := &bizpayment.PaymentResult{}
if err := populateDouyinPaymentAmount(result, amount, []byte(`{"amount":{"total":100,"payer_total":0,"currency":"CNY","payer_currency":"CNY"}}`)); err != nil {
t.Fatal(err)
}
@@ -36,7 +36,7 @@ func TestPopulateDouyinPaymentAmountUsesSignedFieldPresence(t *testing.T) {
t.Fatalf("explicit zero payer_total was not preserved: %+v", result)
}
result = &system.PaymentResult{}
result = &bizpayment.PaymentResult{}
if err := populateDouyinPaymentAmount(result, amount, []byte(`{"amount":{"total":100,"currency":"CNY"}}`)); err != nil {
t.Fatal(err)
}
@@ -44,7 +44,7 @@ func TestPopulateDouyinPaymentAmountUsesSignedFieldPresence(t *testing.T) {
t.Fatalf("missing payer_total was treated as authoritative: %+v", result)
}
if err := populateDouyinPaymentAmount(&system.PaymentResult{}, &douyin.AmountInfo{Total: 100, PayerTotal: 101}, []byte(`{"amount":{"total":100,"payer_total":101}}`)); err == nil {
if err := populateDouyinPaymentAmount(&bizpayment.PaymentResult{}, &douyin.AmountInfo{Total: 100, PayerTotal: 101}, []byte(`{"amount":{"total":100,"payer_total":101}}`)); err == nil {
t.Fatal("accepted payer_total greater than total")
}
}
@@ -73,7 +73,7 @@ func TestValidateDouyinMerchantIdentity(t *testing.T) {
}
func TestAlipayRefundResultValidatesIdentityAndAmount(t *testing.T) {
req := &system.PaymentRefundRequest{
req := &bizpayment.PaymentRefundRequest{
TradeNo: "T-ALIPAY", ProviderTradeNo: "P-ALIPAY", RefundNo: "R-ALIPAY",
Amount: 123, Currency: "CNY",
}
internal/integration/payment/result.go
+2 -2
View File
@@ -4,14 +4,14 @@ import (
"encoding/json"
"errors"
"fmt"
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"net/url"
"strings"
"kra/pkg/paymentkit"
)
func callbackFields(callback *system.PaymentCallback) map[string]string {
func callbackFields(callback *bizpayment.PaymentCallback) map[string]string {
fields := map[string]string{}
if callback == nil {
return fields
internal/integration/payment/result_test.go
+2 -2
View File
@@ -1,12 +1,12 @@
package payment
import (
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"testing"
)
func TestCallbackFieldsAcceptsCaseInsensitiveContentType(t *testing.T) {
callback := &system.PaymentCallback{
callback := &bizpayment.PaymentCallback{
Headers: map[string]string{"content-type": "Application/X-WWW-Form-Urlencoded"},
Body: []byte("out_trade_no=ORDER-1&sign=signature"),
}
internal/integration/payment/saobei.go
+9 -9
View File
@@ -4,7 +4,7 @@ import (
"context"
"errors"
"fmt"
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"strings"
"time"
@@ -34,7 +34,7 @@ func (a *saobeiAdapter) client(c map[string]any) (saobeiClient, error) {
return saobei.NewClient(text(c, "inst_no"), text(c, "key"), text(c, "merchant_no"), text(c, "terminal_id"), text(c, "access_token"), !strings.EqualFold(text(c, "environment"), "sandbox"))
}
func (a *saobeiAdapter) Create(ctx context.Context, req *system.PaymentRequest, c map[string]any) (*system.PaymentResult, error) {
func (a *saobeiAdapter) Create(ctx context.Context, req *bizpayment.PaymentRequest, c map[string]any) (*bizpayment.PaymentResult, error) {
if req == nil {
return nil, errors.New("扫呗支付下单请求为空")
}
@@ -69,7 +69,7 @@ func (a *saobeiAdapter) Create(ctx context.Context, req *system.PaymentRequest,
if strings.TrimSpace(rsp.ResultCode) == saobei.ResultCodePaying {
status = "pending"
}
return &system.PaymentResult{Provider: system.PaymentSaobei, Status: status, TradeNo: req.TradeNo, QueryID: strings.TrimSpace(rsp.OutTradeNo), Payload: mustJSON(rsp)}, nil
return &bizpayment.PaymentResult{Provider: bizpayment.PaymentSaobei, Status: status, TradeNo: req.TradeNo, QueryID: strings.TrimSpace(rsp.OutTradeNo), Payload: mustJSON(rsp)}, nil
}
rsp, err := client.MiniPay(ctx, bm)
if err != nil {
@@ -81,7 +81,7 @@ func (a *saobeiAdapter) Create(ctx context.Context, req *system.PaymentRequest,
if strings.TrimSpace(rsp.OutTradeNo) == "" {
return nil, errors.New("扫呗支付下单响应缺少 out_trade_no")
}
return &system.PaymentResult{Provider: system.PaymentSaobei, Status: "client_pending", TradeNo: req.TradeNo, QueryID: strings.TrimSpace(rsp.OutTradeNo), Payload: mustJSON(rsp)}, nil
return &bizpayment.PaymentResult{Provider: bizpayment.PaymentSaobei, Status: "client_pending", TradeNo: req.TradeNo, QueryID: strings.TrimSpace(rsp.OutTradeNo), Payload: mustJSON(rsp)}, nil
}
func saobeiCreateMethod(extra, config map[string]any) (string, error) {
@@ -100,7 +100,7 @@ func saobeiCreateMethod(extra, config map[string]any) (string, error) {
}
}
func (a *saobeiAdapter) Query(ctx context.Context, tradeNo string, c map[string]any) (*system.PaymentResult, error) {
func (a *saobeiAdapter) 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")
@@ -140,7 +140,7 @@ func (a *saobeiAdapter) Query(ctx context.Context, tradeNo string, c map[string]
if strings.TrimSpace(rsp.ResultCode) == saobei.ResultCodePaying {
status = "pending"
}
result := &system.PaymentResult{Provider: system.PaymentSaobei, Status: status, TradeNo: tradeNoResult, ProviderTradeNo: strings.TrimSpace(rsp.ChannelTradeNo), QueryID: queryID, Payload: mustJSON(rsp), Currency: strings.ToUpper(firstAnyOr(c, "CNY", "currency", "default_currency"))}
result := &bizpayment.PaymentResult{Provider: bizpayment.PaymentSaobei, Status: status, TradeNo: tradeNoResult, ProviderTradeNo: strings.TrimSpace(rsp.ChannelTradeNo), QueryID: queryID, Payload: mustJSON(rsp), Currency: strings.ToUpper(firstAnyOr(c, "CNY", "currency", "default_currency"))}
if rsp.TotalFee != "" {
result.Amount, err = parseIntegerAmount(rsp.TotalFee)
if err != nil {
@@ -161,7 +161,7 @@ func (a *saobeiAdapter) Query(ctx context.Context, tradeNo string, c map[string]
return result, err
}
func (a *saobeiAdapter) Refund(ctx context.Context, req *system.PaymentRefundRequest, c map[string]any) (*system.PaymentResult, error) {
func (a *saobeiAdapter) Refund(ctx context.Context, req *bizpayment.PaymentRefundRequest, c map[string]any) (*bizpayment.PaymentResult, error) {
if req == nil {
return nil, errors.New("扫呗支付退款请求为空")
}
@@ -214,9 +214,9 @@ func (a *saobeiAdapter) Refund(ctx context.Context, req *system.PaymentRefundReq
if refundAmount != req.Amount {
return nil, errors.New("扫呗支付退款响应金额不匹配")
}
return &system.PaymentResult{Provider: system.PaymentSaobei, Status: "pending", TradeNo: tradeNo, ProviderTradeNo: providerRefundID, Amount: refundAmount, Currency: strings.ToUpper(req.Currency), Payload: mustJSON(rsp)}, nil
return &bizpayment.PaymentResult{Provider: bizpayment.PaymentSaobei, Status: "pending", TradeNo: tradeNo, ProviderTradeNo: providerRefundID, Amount: refundAmount, Currency: strings.ToUpper(req.Currency), Payload: mustJSON(rsp)}, nil
}
func (a *saobeiAdapter) Callback(_ context.Context, _ *system.PaymentCallback, _ map[string]any) (*system.PaymentResult, error) {
func (a *saobeiAdapter) Callback(_ context.Context, _ *bizpayment.PaymentCallback, _ map[string]any) (*bizpayment.PaymentResult, error) {
return nil, errors.New("扫呗支付回调没有可复用的 GoPay 验签器，请改用主动查单")
}
internal/integration/payment/saobei_test.go
+9 -9
View File
@@ -2,7 +2,7 @@ package payment
import (
"context"
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"testing"
"github.com/go-pay/gopay"
@@ -65,7 +65,7 @@ func TestSaobeiCreateKeepsQueryAndProviderTradeIDsSeparate(t *testing.T) {
adapter := newSaobeiTestAdapter(&saobeiClientStub{miniPay: func(context.Context, gopay.BodyMap) (*saobei.MiniPayRsp, error) {
return &saobei.MiniPayRsp{RspBase: saobei.RspBase{ReturnCode: "01", ResultCode: "01"}, OutTradeNo: "SAOBEI-ORDER-1"}, nil
}})
result, err := adapter.Create(context.Background(), &system.PaymentRequest{
result, err := adapter.Create(context.Background(), &bizpayment.PaymentRequest{
TradeNo: "LOCAL-1",
Amount: 100,
Extra: map[string]any{"sub_appid": "APP-1", "open_id": "OPEN-1"},
@@ -84,7 +84,7 @@ func TestSaobeiCreateKeepsQueryAndProviderTradeIDsSeparate(t *testing.T) {
request = bm
return &saobei.BarcodePayRsp{RspBase: saobei.RspBase{ReturnCode: "01", ResultCode: "01"}, OutTradeNo: "SAOBEI-ORDER-2", ChannelTradeNo: "CHANNEL-2"}, nil
}})
result, err := adapter.Create(context.Background(), &system.PaymentRequest{
result, err := adapter.Create(context.Background(), &bizpayment.PaymentRequest{
TradeNo: "LOCAL-2",
Amount: 200,
Extra: map[string]any{"method": "barcode", "auth_code": "AUTH-2"},
@@ -116,7 +116,7 @@ func TestSaobeiCreateRejectsMissingPlatformOrderID(t *testing.T) {
if method != "" {
extra["method"] = method
}
if _, err := adapter.Create(context.Background(), &system.PaymentRequest{TradeNo: "LOCAL-MISSING", Amount: 1, Extra: extra}, nil); err == nil {
if _, err := adapter.Create(context.Background(), &bizpayment.PaymentRequest{TradeNo: "LOCAL-MISSING", Amount: 1, Extra: extra}, nil); err == nil {
t.Fatal("Create() accepted response without out_trade_no")
}
})
@@ -130,7 +130,7 @@ func TestSaobeiCreateRejectsUnknownMethodBeforeClient(t *testing.T) {
return &saobeiClientStub{}, nil
}}
_, err := adapter.Create(context.Background(), &system.PaymentRequest{
_, err := adapter.Create(context.Background(), &bizpayment.PaymentRequest{
TradeNo: "LOCAL-UNKNOWN-METHOD", Amount: 1, Extra: map[string]any{"method": "unsupported"},
}, nil)
if err == nil {
@@ -229,7 +229,7 @@ func TestSaobeiRefundPrefersPersistedQueryID(t *testing.T) {
return &saobei.RefundRsp{RspBase: saobei.RspBase{ReturnCode: "01", ResultCode: "01"}, TerminalTrace: "LOCAL-REFUND-1", OutTradeNo: "SAOBEI-ORDER-1", OutRefundNo: "SAOBEI-REFUND-1", RefundFee: "50"}, nil
}})
result, err := adapter.Refund(context.Background(), &system.PaymentRefundRequest{
result, err := adapter.Refund(context.Background(), &bizpayment.PaymentRefundRequest{
TradeNo: "LOCAL-1", QueryID: "SAOBEI-ORDER-1", ProviderTradeNo: "CHANNEL-1",
RefundNo: "LOCAL-REFUND-1", Amount: 50, Currency: "cny",
}, map[string]any{"refund_extra": map[string]any{"out_refund_no": "MUST-NOT-BE-SENT"}})
@@ -257,7 +257,7 @@ func TestSaobeiRefundFallsBackToMerchantTradeNo(t *testing.T) {
return &saobei.RefundRsp{RspBase: saobei.RspBase{ReturnCode: "01", ResultCode: "01"}, TerminalTrace: "LOCAL-REFUND-2", OutRefundNo: "SAOBEI-REFUND-2", RefundFee: "25"}, nil
}})
_, err := adapter.Refund(context.Background(), &system.PaymentRefundRequest{
_, err := adapter.Refund(context.Background(), &bizpayment.PaymentRefundRequest{
TradeNo: "LOCAL-2", RefundNo: "LOCAL-REFUND-2", Amount: 25, Currency: "CNY",
}, nil)
if err != nil {
@@ -281,7 +281,7 @@ func TestSaobeiRefundTreatsPayingAsPending(t *testing.T) {
}, nil
}})
result, err := adapter.Refund(context.Background(), &system.PaymentRefundRequest{
result, err := adapter.Refund(context.Background(), &bizpayment.PaymentRefundRequest{
TradeNo: "LOCAL-3", RefundNo: "LOCAL-REFUND-3", Amount: 25, Currency: "CNY",
}, nil)
if err != nil {
@@ -302,7 +302,7 @@ func TestSaobeiRefundRejectsMismatchedAmount(t *testing.T) {
}, nil
}})
if _, err := adapter.Refund(context.Background(), &system.PaymentRefundRequest{
if _, err := adapter.Refund(context.Background(), &bizpayment.PaymentRefundRequest{
TradeNo: "LOCAL-1", RefundNo: "LOCAL-REFUND-1", Amount: 50, Currency: "CNY",
}, nil); err == nil {
t.Fatal("Refund() accepted a mismatched refund amount")
internal/integration/payment/vendor.go
+9 -9
View File
@@ -10,7 +10,7 @@ import (
"errors"
"fmt"
"io"
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"net/http"
"strings"
"time"
@@ -37,7 +37,7 @@ func newVendorAdapter(provider string, profile vendorProfile) Adapter {
return &vendorPaymentAdapter{provider: provider, profile: profile}
}
func (a *vendorPaymentAdapter) Create(ctx context.Context, req *system.PaymentRequest, c map[string]any) (*system.PaymentResult, error) {
func (a *vendorPaymentAdapter) Create(ctx context.Context, req *bizpayment.PaymentRequest, c map[string]any) (*bizpayment.PaymentResult, error) {
if req == nil {
return nil, errors.New("配置驱动支付下单请求为空")
}
@@ -45,16 +45,16 @@ func (a *vendorPaymentAdapter) Create(ctx context.Context, req *system.PaymentRe
mergeMap(payload, req.Extra, "merchant_id", "app_id", "trade_no", "subject", "amount", "currency", "notify_url", "client_ip", "timestamp", "nonce")
return a.call(ctx, "create_url", payload, req.TradeNo, c)
}
func (a *vendorPaymentAdapter) Query(ctx context.Context, tradeNo string, c map[string]any) (*system.PaymentResult, error) {
func (a *vendorPaymentAdapter) Query(ctx context.Context, tradeNo string, c map[string]any) (*bizpayment.PaymentResult, error) {
return a.call(ctx, "query_url", map[string]any{"merchant_id": text(c, "merchant_id"), "app_id": text(c, "app_id"), "trade_no": tradeNo, "timestamp": time.Now().Unix(), "nonce": nonce()}, tradeNo, c)
}
func (a *vendorPaymentAdapter) Refund(ctx context.Context, req *system.PaymentRefundRequest, c map[string]any) (*system.PaymentResult, error) {
func (a *vendorPaymentAdapter) Refund(ctx context.Context, req *bizpayment.PaymentRefundRequest, c map[string]any) (*bizpayment.PaymentResult, error) {
if req == nil {
return nil, errors.New("支付退款请求为空")
}
return a.call(ctx, "refund_url", map[string]any{"merchant_id": text(c, "merchant_id"), "app_id": text(c, "app_id"), "trade_no": req.TradeNo, "refund_no": req.RefundNo, "amount": req.Amount, "total_amount": req.TotalAmount, "currency": req.Currency, "timestamp": time.Now().Unix(), "nonce": nonce()}, req.TradeNo, c)
}
func (a *vendorPaymentAdapter) Callback(_ context.Context, callback *system.PaymentCallback, c map[string]any) (*system.PaymentResult, error) {
func (a *vendorPaymentAdapter) Callback(_ context.Context, callback *bizpayment.PaymentCallback, c map[string]any) (*bizpayment.PaymentResult, error) {
if callback == nil || len(callback.Body) == 0 {
return nil, errors.New("配置驱动支付回调为空")
}
@@ -98,9 +98,9 @@ func (a *vendorPaymentAdapter) Callback(_ context.Context, callback *system.Paym
status = "success"
}
payload, _ := json.Marshal(fields)
return &system.PaymentResult{Provider: a.provider, Status: status, TradeNo: tradeNo, ProviderTradeNo: providerTradeNo, Payload: payload}, nil
return &bizpayment.PaymentResult{Provider: a.provider, Status: status, TradeNo: tradeNo, ProviderTradeNo: providerTradeNo, Payload: payload}, nil
}
func (a *vendorPaymentAdapter) call(ctx context.Context, endpointKey string, payload map[string]any, tradeNo string, c map[string]any) (*system.PaymentResult, error) {
func (a *vendorPaymentAdapter) call(ctx context.Context, endpointKey string, payload map[string]any, tradeNo string, c map[string]any) (*bizpayment.PaymentResult, error) {
endpoint := text(c, endpointKey)
if endpoint == "" {
return nil, fmt.Errorf("%s 未配置 %s", a.provider, endpointKey)
@@ -131,7 +131,7 @@ func (a *vendorPaymentAdapter) call(ctx context.Context, endpointKey string, pay
if response.StatusCode >= 300 {
return nil, fmt.Errorf("%s HTTP %d", a.provider, response.StatusCode)
}
result := &system.PaymentResult{Provider: a.provider, Status: "created", TradeNo: tradeNo, Payload: ensureJSON(body)}
result := &bizpayment.PaymentResult{Provider: a.provider, Status: "created", TradeNo: tradeNo, Payload: ensureJSON(body)}
if endpointKey != "query_url" {
return result, nil
}
@@ -167,7 +167,7 @@ func (a *vendorPaymentAdapter) call(ctx context.Context, endpointKey string, pay
return result, nil
}
func populateVendorBreakdown(result *system.PaymentResult, object map[string]any, c map[string]any) error {
func populateVendorBreakdown(result *bizpayment.PaymentResult, object map[string]any, c map[string]any) error {
if result == nil || result.Status != "success" {
return nil
}
internal/integration/payment/wechat_v2.go
+17 -17
View File
@@ -8,7 +8,7 @@ import (
"encoding/json"
"errors"
"fmt"
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"net/http"
"net/url"
"strings"
@@ -48,7 +48,7 @@ func wechatV2Sign(values map[string]string, key, signType string) string {
return gopayWechat.GetReleaseSign(key, wechatV2SignType(signType), body)
}
func (a *wechatV2Adapter) Create(ctx context.Context, req *system.PaymentRequest, c map[string]any) (*system.PaymentResult, error) {
func (a *wechatV2Adapter) Create(ctx context.Context, req *bizpayment.PaymentRequest, c map[string]any) (*bizpayment.PaymentResult, error) {
if req == nil {
return nil, errors.New("微信支付 v2 下单请求为空")
}
@@ -98,15 +98,15 @@ func (a *wechatV2Adapter) Create(ctx context.Context, req *system.PaymentRequest
if err = verifyWechatV2Response(resultValues, client.ApiKey, values["sign_type"]); err != nil {
return nil, err
}
return &system.PaymentResult{
Provider: system.PaymentWechatV2,
return &bizpayment.PaymentResult{
Provider: bizpayment.PaymentWechatV2,
Status: "created",
TradeNo: req.TradeNo,
Payload: wechatV2Payload(resultValues),
}, nil
}
func (a *wechatV2Adapter) createMicropay(ctx context.Context, client *gopayWechat.Client, req *system.PaymentRequest, c map[string]any, values map[string]string) (*system.PaymentResult, error) {
func (a *wechatV2Adapter) createMicropay(ctx context.Context, client *gopayWechat.Client, req *bizpayment.PaymentRequest, c map[string]any, values map[string]string) (*bizpayment.PaymentResult, error) {
authCode := firstAny(req.Extra, "auth_code", "authcode", "barcode", "pay_code", "payment_code")
if authCode == "" {
authCode = firstAny(c, "auth_code", "authcode", "barcode", "pay_code", "payment_code")
@@ -145,14 +145,14 @@ func (a *wechatV2Adapter) createMicropay(ctx context.Context, client *gopayWecha
return nil, errors.New("微信支付 v2 付款码支付响应的 out_trade_no 不匹配")
}
if strings.EqualFold(resultValues["err_code"], "USERPAYING") {
return &system.PaymentResult{Provider: system.PaymentWechatV2, Status: "pending", TradeNo: req.TradeNo, Payload: wechatV2Payload(resultValues)}, nil
return &bizpayment.PaymentResult{Provider: bizpayment.PaymentWechatV2, Status: "pending", TradeNo: req.TradeNo, Payload: wechatV2Payload(resultValues)}, nil
}
providerTradeNo := strings.TrimSpace(resultValues["transaction_id"])
if providerTradeNo == "" {
return nil, errors.New("微信支付 v2 付款码支付响应缺少 transaction_id")
}
result := &system.PaymentResult{
Provider: system.PaymentWechatV2, Status: "success", TradeNo: req.TradeNo,
result := &bizpayment.PaymentResult{
Provider: bizpayment.PaymentWechatV2, Status: "success", TradeNo: req.TradeNo,
ProviderTradeNo: providerTradeNo, Payload: wechatV2Payload(resultValues),
}
amount := strings.TrimSpace(resultValues["total_fee"])
@@ -201,7 +201,7 @@ func wechatV2CreateMethod(extra, config map[string]any) (string, error) {
}
}
func (a *wechatV2Adapter) Query(ctx context.Context, tradeNo string, c map[string]any) (*system.PaymentResult, error) {
func (a *wechatV2Adapter) Query(ctx context.Context, tradeNo string, c map[string]any) (*bizpayment.PaymentResult, error) {
tradeNo = strings.TrimSpace(tradeNo)
if tradeNo == "" {
return nil, errors.New("微信支付 v2 查单缺少 out_trade_no")
@@ -226,8 +226,8 @@ func (a *wechatV2Adapter) Query(ctx context.Context, tradeNo string, c map[strin
if err = verifyWechatV2Response(values, client.ApiKey, body.GetString("sign_type")); err != nil {
return nil, err
}
result := &system.PaymentResult{
Provider: system.PaymentWechatV2,
result := &bizpayment.PaymentResult{
Provider: bizpayment.PaymentWechatV2,
Status: normalizePaymentStatus(values["trade_state"], "pending"),
TradeNo: first(values, "out_trade_no"),
Payload: wechatV2Payload(values),
@@ -258,7 +258,7 @@ func (a *wechatV2Adapter) Query(ctx context.Context, tradeNo string, c map[strin
return result, nil
}
func (a *wechatV2Adapter) Refund(ctx context.Context, req *system.PaymentRefundRequest, c map[string]any) (*system.PaymentResult, error) {
func (a *wechatV2Adapter) Refund(ctx context.Context, req *bizpayment.PaymentRefundRequest, c map[string]any) (*bizpayment.PaymentResult, error) {
if req == nil {
return nil, errors.New("微信支付 v2 退款请求为空")
}
@@ -305,8 +305,8 @@ func (a *wechatV2Adapter) Refund(ctx context.Context, req *system.PaymentRefundR
if err = validateWechatV2RefundIdentity(tradeNo, refundNo, rsp); err != nil {
return nil, err
}
result := &system.PaymentResult{
Provider: system.PaymentWechatV2,
result := &bizpayment.PaymentResult{
Provider: bizpayment.PaymentWechatV2,
Status: "created",
TradeNo: tradeNo,
ProviderTradeNo: strings.TrimSpace(rsp.RefundId),
@@ -351,7 +351,7 @@ func validateWechatV2RefundIdentity(tradeNo, refundNo string, rsp *gopayWechat.R
return nil
}
func (a *wechatV2Adapter) Callback(_ context.Context, callback *system.PaymentCallback, c map[string]any) (*system.PaymentResult, error) {
func (a *wechatV2Adapter) Callback(_ context.Context, callback *bizpayment.PaymentCallback, c map[string]any) (*bizpayment.PaymentResult, error) {
if callback == nil || len(callback.Body) == 0 {
return nil, errors.New("微信支付 v2 回调为空")
}
@@ -375,7 +375,7 @@ func (a *wechatV2Adapter) Callback(_ context.Context, callback *system.PaymentCa
status = "success"
}
payload, _ := json.Marshal(values)
return &system.PaymentResult{Provider: system.PaymentWechatV2, Status: status, TradeNo: first(values, "out_trade_no"), ProviderTradeNo: values["transaction_id"], Payload: payload}, nil
return &bizpayment.PaymentResult{Provider: bizpayment.PaymentWechatV2, Status: status, TradeNo: first(values, "out_trade_no"), ProviderTradeNo: values["transaction_id"], Payload: payload}, nil
}
func newWechatV2Client(c map[string]any, endpoint string) (*gopayWechat.Client, error) {
@@ -466,7 +466,7 @@ func wechatV2Payload(values map[string]string) []byte {
return []byte(gopayWechat.GenerateXml(toGoPayBodyMap(values)))
}
func populateWechatV2Breakdown(result *system.PaymentResult, values map[string]string) error {
func populateWechatV2Breakdown(result *bizpayment.PaymentResult, values map[string]string) error {
if result == nil || result.Status != "success" {
return nil
}
internal/integration/payment/wechat_v3.go
+19 -19
View File
@@ -8,7 +8,7 @@ import (
"encoding/pem"
"errors"
"fmt"
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"net/http"
"net/url"
"strings"
@@ -20,7 +20,7 @@ import (
type wechatV3Adapter struct{}
func (a *wechatV3Adapter) Create(ctx context.Context, req *system.PaymentRequest, c map[string]any) (*system.PaymentResult, error) {
func (a *wechatV3Adapter) Create(ctx context.Context, req *bizpayment.PaymentRequest, c map[string]any) (*bizpayment.PaymentResult, error) {
if req == nil {
return nil, errors.New("微信支付 v3 下单请求为空")
}
@@ -123,7 +123,7 @@ func normalizeWechatV3TradeType(value string) string {
return strings.NewReplacer(".", "", "-", "_", " ", "_").Replace(strings.ToLower(strings.TrimSpace(value)))
}
func wechatV3CodePayResult(tradeNo string, rsp *gopayWechatV3.CodePayRsp) (*system.PaymentResult, error) {
func wechatV3CodePayResult(tradeNo string, rsp *gopayWechatV3.CodePayRsp) (*bizpayment.PaymentResult, error) {
if rsp == nil {
return nil, errors.New("微信支付 v3 付款码响应为空")
}
@@ -139,8 +139,8 @@ func wechatV3CodePayResult(tradeNo string, rsp *gopayWechatV3.CodePayRsp) (*syst
} else if returnedTradeNo != tradeNo {
return nil, errors.New("微信支付 v3 付款码响应的商户订单号不匹配")
}
result := &system.PaymentResult{
Provider: system.PaymentWechatV3,
result := &bizpayment.PaymentResult{
Provider: bizpayment.PaymentWechatV3,
Status: normalizePaymentStatus(order.TradeState, "pending"),
TradeNo: tradeNo,
ProviderTradeNo: strings.TrimSpace(order.TransactionId),
@@ -179,7 +179,7 @@ func wechatV3CodePayResult(tradeNo string, rsp *gopayWechatV3.CodePayRsp) (*syst
return result, nil
}
func (a *wechatV3Adapter) Query(ctx context.Context, tradeNo string, c map[string]any) (*system.PaymentResult, error) {
func (a *wechatV3Adapter) Query(ctx context.Context, tradeNo string, c map[string]any) (*bizpayment.PaymentResult, error) {
tradeNo = strings.TrimSpace(tradeNo)
if tradeNo == "" {
return nil, errors.New("微信支付 v3 查单缺少 out_trade_no")
@@ -204,8 +204,8 @@ func (a *wechatV3Adapter) Query(ctx context.Context, tradeNo string, c map[strin
order := rsp.Response
payload := wechatV3ResponsePayload(rsp.SignInfo, order)
result := &system.PaymentResult{
Provider: system.PaymentWechatV3,
result := &bizpayment.PaymentResult{
Provider: bizpayment.PaymentWechatV3,
Status: normalizePaymentStatus(order.TradeState, "pending"),
TradeNo: order.OutTradeNo,
ProviderTradeNo: order.TransactionId,
@@ -236,7 +236,7 @@ func (a *wechatV3Adapter) Query(ctx context.Context, tradeNo string, c map[strin
return result, nil
}
func (a *wechatV3Adapter) Refund(ctx context.Context, req *system.PaymentRefundRequest, c map[string]any) (*system.PaymentResult, error) {
func (a *wechatV3Adapter) Refund(ctx context.Context, req *bizpayment.PaymentRefundRequest, c map[string]any) (*bizpayment.PaymentResult, error) {
if req == nil {
return nil, errors.New("微信支付 v3 退款请求为空")
}
@@ -279,8 +279,8 @@ func (a *wechatV3Adapter) Refund(ctx context.Context, req *system.PaymentRefundR
if err != nil {
return nil, err
}
result := &system.PaymentResult{
Provider: system.PaymentWechatV3,
result := &bizpayment.PaymentResult{
Provider: bizpayment.PaymentWechatV3,
Status: normalizeRefundState(refund.Status),
TradeNo: tradeNo,
ProviderTradeNo: refundID,
@@ -336,7 +336,7 @@ func validateWechatV3RefundIdentity(refund *gopayWechatV3.RefundOrderResponse, t
return refundID, nil
}
func (a *wechatV3Adapter) Callback(ctx context.Context, callback *system.PaymentCallback, c map[string]any) (*system.PaymentResult, error) {
func (a *wechatV3Adapter) Callback(ctx context.Context, callback *bizpayment.PaymentCallback, c map[string]any) (*bizpayment.PaymentResult, error) {
if callback == nil {
return nil, errors.New("微信支付 v3 回调为空")
}
@@ -395,8 +395,8 @@ func (a *wechatV3Adapter) Callback(ctx context.Context, callback *system.Payment
return nil, errors.New("微信支付 v3 回调 appid 不匹配")
}
plain, _ := json.Marshal(pay)
return &system.PaymentResult{
Provider: system.PaymentWechatV3,
return &bizpayment.PaymentResult{
Provider: bizpayment.PaymentWechatV3,
Status: status,
TradeNo: pay.OutTradeNo,
ProviderTradeNo: pay.TransactionId,
@@ -490,22 +490,22 @@ func wechatV3PlatformSerial(certificate string) (string, error) {
return strings.ToUpper(cert.SerialNumber.Text(16)), nil
}
func wechatV3CreateResult(tradeNo string, code int, signInfo *gopayWechatV3.SignInfo, response any, errResponse gopayWechatV3.ErrResponse, rawError string) (*system.PaymentResult, error) {
func wechatV3CreateResult(tradeNo string, code int, signInfo *gopayWechatV3.SignInfo, response any, errResponse gopayWechatV3.ErrResponse, rawError string) (*bizpayment.PaymentResult, error) {
if code != gopayWechatV3.Success {
return nil, wechatV3APIError("下单", code, errResponse, rawError)
}
if response == nil {
return nil, errors.New("微信支付 v3 下单响应缺少预支付信息")
}
return &system.PaymentResult{
Provider: system.PaymentWechatV3,
return &bizpayment.PaymentResult{
Provider: bizpayment.PaymentWechatV3,
Status: "created",
TradeNo: tradeNo,
Payload: wechatV3ResponsePayload(signInfo, response),
}, nil
}
func wechatV3PrepayCreateResult(client *gopayWechatV3.ClientV3, appID, tradeType, tradeNo string, rsp *gopayWechatV3.PrepayRsp) (*system.PaymentResult, error) {
func wechatV3PrepayCreateResult(client *gopayWechatV3.ClientV3, appID, tradeType, tradeNo string, rsp *gopayWechatV3.PrepayRsp) (*bizpayment.PaymentResult, error) {
if rsp == nil {
return nil, errors.New("微信支付 v3 下单响应为空")
}
@@ -552,7 +552,7 @@ func wechatV3ResponsePayload(signInfo *gopayWechatV3.SignInfo, response any) []b
return payload
}
func populateWechatV3Breakdown(result *system.PaymentResult, object map[string]any) error {
func populateWechatV3Breakdown(result *bizpayment.PaymentResult, object map[string]any) error {
if result == nil || result.Status != "success" {
return nil
}
internal/integration/payment/wechat_v3_codepay_test.go
+5 -5
View File
@@ -4,7 +4,7 @@ import (
"context"
"encoding/json"
"io"
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"net/http"
"net/http/httptest"
"strings"
@@ -51,8 +51,8 @@ func TestWechatV3CodePayUsesGoPaySDK(t *testing.T) {
}))
defer server.Close()
result, err := (&wechatV3Adapter{}).Create(context.Background(), &system.PaymentRequest{
Provider: system.PaymentWechatV3,
result, err := (&wechatV3Adapter{}).Create(context.Background(), &bizpayment.PaymentRequest{
Provider: bizpayment.PaymentWechatV3,
TradeNo: "T-WECHAT-CODEPAY",
Subject: "subject",
Amount: 123,
@@ -85,7 +85,7 @@ func TestWechatV3CodePayUsesGoPaySDK(t *testing.T) {
if amount["total"] != float64(123) || amount["currency"] != "CNY" {
t.Fatalf("request amount = %#v", amount)
}
if result.Provider != system.PaymentWechatV3 || result.Status != "success" || result.TradeNo != "T-WECHAT-CODEPAY" || result.ProviderTradeNo != "WX-CODEPAY-1" || result.QueryID != "" {
if result.Provider != bizpayment.PaymentWechatV3 || result.Status != "success" || result.TradeNo != "T-WECHAT-CODEPAY" || result.ProviderTradeNo != "WX-CODEPAY-1" || result.QueryID != "" {
t.Fatalf("result identity = %+v", result)
}
if result.Amount != 123 || result.Currency != "CNY" || result.PayerCurrency != "CNY" || !result.AmountBreakdownKnown || result.PayerPaidAmount != 100 || result.CashPaidAmount != 100 || result.DiscountAmount != 23 {
@@ -108,7 +108,7 @@ func TestWechatV3CodePayAliasesRequireAuthCode(t *testing.T) {
for _, method := range []string{"micropay", "micro_pay", "micro-pay", "codepay", "code_pay", "code-pay", "barcode", "barcode_pay", "facepay", "face_pay"} {
t.Run(method, func(t *testing.T) {
_, err := (&wechatV3Adapter{}).Create(context.Background(), &system.PaymentRequest{
_, err := (&wechatV3Adapter{}).Create(context.Background(), &bizpayment.PaymentRequest{
TradeNo: "T-WECHAT-CODEPAY", Subject: "subject", Amount: 1, Currency: "CNY",
Extra: map[string]any{"method": method},
}, config)
internal/integration/payment/wechat_v3_douyin_refund_test.go
+9 -9
View File
@@ -2,7 +2,7 @@ package payment
import (
"context"
"kra/internal/biz/system"
bizpayment "kra/internal/biz/payment"
"strings"
"testing"
@@ -13,12 +13,12 @@ import (
func TestWechatV3RefundRejectsBlankIdentityBeforeClient(t *testing.T) {
for _, tc := range []struct {
name string
req *system.PaymentRefundRequest
req *bizpayment.PaymentRefundRequest
want string
}{
{name: "blank trade number", req: &system.PaymentRefundRequest{TradeNo: " ", RefundNo: "R1"}, want: "out_trade_no"},
{name: "blank refund number", req: &system.PaymentRefundRequest{TradeNo: "T1", RefundNo: " "}, want: "out_refund_no"},
{name: "invalid amount", req: &system.PaymentRefundRequest{TradeNo: "T1", RefundNo: "R1", Amount: 2, TotalAmount: 1}, want: "金额"},
{name: "blank trade number", req: &bizpayment.PaymentRefundRequest{TradeNo: " ", RefundNo: "R1"}, want: "out_trade_no"},
{name: "blank refund number", req: &bizpayment.PaymentRefundRequest{TradeNo: "T1", RefundNo: " "}, want: "out_refund_no"},
{name: "invalid amount", req: &bizpayment.PaymentRefundRequest{TradeNo: "T1", RefundNo: "R1", Amount: 2, TotalAmount: 1}, want: "金额"},
} {
t.Run(tc.name, func(t *testing.T) {
_, err := (&wechatV3Adapter{}).Refund(context.Background(), tc.req, nil)
@@ -67,12 +67,12 @@ func TestWechatV3RefundIdentityValidation(t *testing.T) {
func TestDouyinRefundRejectsBlankIdentityBeforeClient(t *testing.T) {
for _, tc := range []struct {
name string
req *system.PaymentRefundRequest
req *bizpayment.PaymentRefundRequest
want string
}{
{name: "blank trade number", req: &system.PaymentRefundRequest{TradeNo: " ", RefundNo: "R1"}, want: "out_trade_no"},
{name: "blank refund number", req: &system.PaymentRefundRequest{TradeNo: "T1", RefundNo: " "}, want: "out_refund_no"},
{name: "invalid amount", req: &system.PaymentRefundRequest{TradeNo: "T1", RefundNo: "R1", Amount: 2, TotalAmount: 1}, want: "金额"},
{name: "blank trade number", req: &bizpayment.PaymentRefundRequest{TradeNo: " ", RefundNo: "R1"}, want: "out_trade_no"},
{name: "blank refund number", req: &bizpayment.PaymentRefundRequest{TradeNo: "T1", RefundNo: " "}, want: "out_refund_no"},
{name: "invalid amount", req: &bizpayment.PaymentRefundRequest{TradeNo: "T1", RefundNo: "R1", Amount: 2, TotalAmount: 1}, want: "金额"},
} {
t.Run(tc.name, func(t *testing.T) {
_, err := (&douyinAdapter{}).Refund(context.Background(), tc.req, nil)
internal/integration/provider.go
+2 -1
View File
@@ -4,6 +4,7 @@
package integration
import (
integrationbiz "kra/internal/biz/integration"
"kra/internal/biz/system"
"kra/internal/integration/cache"
"kra/internal/integration/email"
@@ -21,7 +22,7 @@ var ProviderSet = wire.NewSet(
email.NewEmailRepo,
storage.NewFileStorage,
NewConnectivityTester,
wire.Bind(new(system.IntegrationConnectionTester), new(*ConnectivityTester)),
wire.Bind(new(integrationbiz.IntegrationConnectionTester), new(*ConnectivityTester)),
mqintegration.New,
wire.Bind(new(mq.Client), new(*mqintegration.Reloadable)),
wire.Bind(new(mq.Registry), new(*mqintegration.Reloadable)),