优化结构

This commit is contained in:
Yvan
2026-08-28 10:21:59 +08:00
parent a16d362bb5
commit fec3820464
19 changed files with 138 additions and 136 deletions
+2 -1
View File
@@ -8,6 +8,7 @@ import (
"fmt"
"io"
bizpayment "kra/internal/biz/payment"
"kra/internal/paymentkit"
"net/http"
"net/url"
"strings"
@@ -435,7 +436,7 @@ func alipayCreateMethod(extra, config map[string]any) (string, error) {
if value == "" {
value = firstAny(config, "method", "pay_method", "trade_type", "channel")
}
normalized := strings.NewReplacer(".", "_", "-", "_", " ", "_").Replace(strings.ToLower(strings.TrimSpace(value)))
normalized := paymentkit.NormalizePaymentMethod(value)
switch normalized {
case "", "create", "trade_create", "alipay_trade_create", "jsapi", "miniapp", "mini_program":
return "alipay.trade.create", nil
+2 -1
View File
@@ -12,6 +12,7 @@ import (
"fmt"
"io"
bizpayment "kra/internal/biz/payment"
"kra/internal/paymentkit"
"net/http"
"strings"
"sync"
@@ -207,7 +208,7 @@ func allinpayCreateMethod(extra, config map[string]any) (string, error) {
if value == "" {
value = firstAny(config, "method", "pay_method", "trade_type")
}
normalized := strings.NewReplacer(".", "_", "-", "_", " ", "_").Replace(strings.ToLower(strings.TrimSpace(value)))
normalized := paymentkit.NormalizePaymentMethod(value)
switch normalized {
case "", "pay", "unified", "unified_pay":
return "pay", nil
+2 -1
View File
@@ -6,6 +6,7 @@ import (
"errors"
"fmt"
bizpayment "kra/internal/biz/payment"
"kra/internal/paymentkit"
"strings"
"github.com/go-pay/gopay"
@@ -110,7 +111,7 @@ func douyinCreateMethod(extra, config map[string]any) (string, error) {
if value == "" {
value = firstAny(config, "method", "pay_method", "trade_type", "pay_type", "channel")
}
normalized := strings.NewReplacer(".", "_", "-", "_", " ", "_").Replace(strings.ToLower(strings.TrimSpace(value)))
normalized := paymentkit.NormalizePaymentMethod(value)
switch normalized {
case "", "jsapi", "js_api", "mini", "mini_program", "miniprogram", "applet":
return "jsapi", nil
+2 -1
View File
@@ -5,6 +5,7 @@ import (
"errors"
"fmt"
bizpayment "kra/internal/biz/payment"
"kra/internal/paymentkit"
"strings"
"github.com/go-pay/gopay"
@@ -71,7 +72,7 @@ func lakalaCreateMethod(extra, config map[string]any) string {
if method == "" {
method = firstAny(config, "method", "pay_method", "trade_type")
}
return strings.NewReplacer(".", "_", "-", "_", " ", "_").Replace(strings.ToLower(strings.TrimSpace(method)))
return paymentkit.NormalizePaymentMethod(method)
}
func lakalaCreateResult(tradeNo string, rsp *lakala.PaymentRsp) (*bizpayment.PaymentResult, error) {
+2 -1
View File
@@ -5,6 +5,7 @@ import (
"errors"
"fmt"
bizpayment "kra/internal/biz/payment"
"kra/internal/paymentkit"
"strings"
"time"
@@ -89,7 +90,7 @@ func saobeiCreateMethod(extra, config map[string]any) (string, error) {
if value == "" {
value = firstAny(config, "method", "pay_method", "trade_type")
}
normalized := strings.NewReplacer(".", "_", "-", "_", " ", "_").Replace(strings.ToLower(strings.TrimSpace(value)))
normalized := paymentkit.NormalizePaymentMethod(value)
switch normalized {
case "", "mini", "mini_pay", "miniapp", "mini_app", "mini_program", "miniprogram", "jsapi", "js_api":
return "mini", nil
+2 -1
View File
@@ -11,6 +11,7 @@ import (
"errors"
"fmt"
bizpayment "kra/internal/biz/payment"
"kra/internal/paymentkit"
"net/http"
"net/url"
"strings"
@@ -180,7 +181,7 @@ func wechatV2CreateMethod(extra, config map[string]any) (string, error) {
if value == "" {
value = firstAny(config, "trade_type", "pay_type", "method", "pay_method", "channel")
}
normalized := strings.NewReplacer(".", "_", "-", "_", " ", "_").Replace(strings.ToLower(strings.TrimSpace(value)))
normalized := paymentkit.NormalizePaymentMethod(value)
switch normalized {
case "", "jsapi", "js_api", "mini", "miniapp", "mini_program", "miniprogram", "applet":
return gopayWechat.TradeType_JsApi, nil