优化结构

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
+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")