优化结构

internal/integration/payment/result.go

@@ -8,7 +8,7 @@ import (
 	"net/url"
 	"strings"
 
-	"kra/pkg/paymentkit"
+	"kra/internal/paymentkit"
 )
 
 func callbackFields(callback *bizpayment.PaymentCallback) map[string]string {
@@ -56,57 +56,53 @@ func first(values map[string]string, keys ...string) string {
 }
 
 func text(values map[string]any, key string) string {
-	return paymentutil.Text(values, key)
+	return paymentkit.Text(values, key)
 }
 
 func firstAny(values map[string]any, keys ...string) string {
-	return paymentutil.FirstText(values, keys...)
+	return paymentkit.FirstText(values, keys...)
 }
 
 // Compatibility shims keep channel adapters focused on protocol and
-// persistence concerns while stateless parsing rules live in paymentutil.
+// persistence concerns while stateless parsing rules live in paymentkit.
 func normalizePaymentStatus(value, fallback string) string {
-	return paymentutil.NormalizeStatus(value, fallback)
+	return paymentkit.NormalizeStatus(value, fallback)
 }
 
 func parseIntegerAmount(value string) (int64, error) {
-	return paymentutil.ParseIntegerAmount(value)
+	return paymentkit.ParseIntegerAmount(value)
 }
 
 func parseDecimalAmount(value string, scale int64) (int64, error) {
-	return paymentutil.ParseDecimalAmount(value, scale)
+	return paymentkit.ParseDecimalAmount(value, scale)
 }
 
 func formatDecimalAmount(amount, scale int64) (string, error) {
-	return paymentutil.FormatDecimalAmount(amount, scale)
+	return paymentkit.FormatDecimalAmount(amount, scale)
 }
 
 func configuredInt64(values map[string]any, key string, fallback int64) int64 {
-	return paymentutil.ConfiguredInt64(values, key, fallback)
+	return paymentkit.ConfiguredInt64(values, key, fallback)
 }
 
 func jsonObject(raw []byte) map[string]any {
-	return paymentutil.JSONObject(raw)
-}
-
-func nestedString(value any, keys ...string) string {
-	return paymentutil.NestedString(value, keys...)
+	return paymentkit.JSONObject(raw)
 }
 
 func valueAtPath(value any, path string) any {
-	return paymentutil.ValueAtPath(value, path)
+	return paymentkit.ValueAtPath(value, path)
 }
 
 func stringAtPath(value any, path string) string {
-	return paymentutil.StringAtPath(value, path)
+	return paymentkit.StringAtPath(value, path)
 }
 
 func configuredValues(values map[string]any, key string) []string {
-	return paymentutil.ConfiguredValues(values, key)
+	return paymentkit.ConfiguredValues(values, key)
 }
 
 func containsFold(values []string, value string) bool {
-	return paymentutil.ContainsFold(values, value)
+	return paymentkit.ContainsFold(values, value)
 }
 
 // parseConfiguredAmount reads a provider amount field using an explicit unit
@@ -138,12 +134,3 @@ func parseConfiguredAmount(object any, config map[string]any, fieldKey, scaleKey
 	}
 	return amount, true, nil
 }
-
-func amountFromDecimalField(values map[string]any, key string, fallback int64) (int64, bool, error) {
-	value := strings.TrimSpace(fmt.Sprint(values[key]))
-	if value == "" || value == "<nil>" {
-		return 0, false, nil
-	}
-	amount, err := parseDecimalAmount(value, fallback)
-	return amount, true, err
-}