feat(apple): 添加通过transaction_id附加苹果交易功能

新增通过transaction_id附加苹果交易的功能，包括：
1. 添加AttachAppleTransactionByIdRequest类型和对应路由
2. 实现AppleIAPConfig配置模型
3. 添加ServerAPI获取交易信息的实现
4. 优化JWS解析逻辑，增加cleanB64函数处理空格
5. 完善苹果通知处理逻辑的日志和注释

internal/handler/notify/appleIAPNotifyHandler.go

@@ -1,9 +1,10 @@
 package notify
 
 import (
-	"github.com/gin-gonic/gin"
-	"io"
 	"encoding/json"
+	"io"
+
+	"github.com/gin-gonic/gin"
 	"github.com/perfect-panel/server/internal/logic/notify"
 	"github.com/perfect-panel/server/internal/svc"
 	"github.com/perfect-panel/server/pkg/result"

internal/handler/public/iap/apple/attachTransactionByIdHandler.go

@@ -0,0 +1,23 @@
+package apple
+
+import (
+	"github.com/gin-gonic/gin"
+	appleLogic "github.com/perfect-panel/server/internal/logic/public/iap/apple"
+	"github.com/perfect-panel/server/internal/svc"
+	"github.com/perfect-panel/server/internal/types"
+	"github.com/perfect-panel/server/pkg/result"
+)
+
+func AttachAppleTransactionByIdHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
+	return func(c *gin.Context) {
+		var req types.AttachAppleTransactionByIdRequest
+		_ = c.ShouldBind(&req)
+		if err := svcCtx.Validate(&req); err != nil {
+			result.ParamErrorResult(c, err)
+			return
+		}
+		l := appleLogic.NewAttachTransactionByIdLogic(c.Request.Context(), svcCtx)
+		resp, err := l.AttachById(&req)
+		result.HttpResult(c, resp, err)
+	}
+}

internal/handler/routes.go

@@ -725,6 +725,7 @@ func RegisterHandlers(router *gin.Engine, serverCtx *svc.ServiceContext) {
 	{
 		iapAppleGroupRouter.GET("/status", publicIapApple.GetAppleStatusHandler(serverCtx))
 		iapAppleGroupRouter.POST("/transactions/attach", publicIapApple.AttachAppleTransactionHandler(serverCtx))
+		iapAppleGroupRouter.POST("/transactions/attach_by_id", publicIapApple.AttachAppleTransactionByIdHandler(serverCtx))
 		iapAppleGroupRouter.POST("/restore", publicIapApple.RestoreAppleTransactionsHandler(serverCtx))
 	}
 

internal/logic/admin/payment/createPaymentMethodLogic.go

@@ -131,6 +131,8 @@ func parsePaymentPlatformConfig(ctx context.Context, platform payment.Platform,
 		return handleConfig("Epay", &paymentModel.EPayConfig{})
 	case payment.CryptoSaaS:
 		return handleConfig("CryptoSaaS", &paymentModel.CryptoSaaSConfig{})
+	case payment.AppleIAP:
+		return handleConfig("AppleIAP", &paymentModel.AppleIAPConfig{})
 	default:
 		return ""
 	}

internal/logic/admin/user/deleteUserDeviceLogic.go

@@ -8,9 +8,9 @@ import (
 	"github.com/perfect-panel/server/pkg/xerr"
 	"github.com/pkg/errors"
 
+	"github.com/perfect-panel/server/internal/config"
 	"github.com/perfect-panel/server/internal/svc"
 	"github.com/perfect-panel/server/internal/types"
-    "github.com/perfect-panel/server/internal/config"
 	"github.com/perfect-panel/server/pkg/logger"
 	"gorm.io/gorm"
 )

internal/logic/notify/appleIAPNotifyLogic.go

@@ -10,12 +10,20 @@ import (
 	"gorm.io/gorm"
 )
 
+// AppleIAPNotifyLogic 用于处理 App Store Server Notifications V2 的苹果内购通知
+// 负责：JWS 验签、事务记录写入/撤销更新、订阅生命周期同步（续期/撤销等）
 type AppleIAPNotifyLogic struct {
 	logger.Logger
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
 }
 
+// NewAppleIAPNotifyLogic 创建通知处理逻辑实例
+// 参数：
+// - ctx: 请求上下文
+// - svcCtx: 服务上下文，包含 DB/Redis/配置 等
+// 返回：
+// - *AppleIAPNotifyLogic: 通知处理逻辑对象
 func NewAppleIAPNotifyLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AppleIAPNotifyLogic {
 	return &AppleIAPNotifyLogic{
 		Logger: logger.WithContext(ctx),
@@ -24,15 +32,30 @@ func NewAppleIAPNotifyLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Ap
 	}
 }
 
+// Handle 处理苹果内购通知
+// 流程：
+// 1. 验签通知信封，解析得到交易 JWS 并再次验签；
+// 2. 写入或更新事务记录（幂等按 OriginalTransactionId）；
+// 3. 依据产品映射更新订阅到期时间或撤销状态；
+// 4. 全流程关键节点输出详细中文日志，便于定位问题。
+// 参数：
+// - signedPayload: 通知信封的 JWS（包含 data.signedTransactionInfo）
+// 返回：
+// - error: 处理失败错误，成功返回 nil
 func (l *AppleIAPNotifyLogic) Handle(signedPayload string) error {
-	txPayload, _, err := iapapple.VerifyNotificationSignedPayload(signedPayload)
+	txPayload, ntype, err := iapapple.VerifyNotificationSignedPayload(signedPayload)
 	if err != nil {
+		// 验签失败，记录错误以便排查（通常为 JWS 格式/证书链问题）
+		l.Errorw("iap notify verify failed", logger.Field("error", err.Error()))
 		return err
 	}
+	// 验签通过，记录通知类型与关键交易标识
+	l.Infow("iap notify verified", logger.Field("type", ntype), logger.Field("productId", txPayload.ProductId), logger.Field("originalTransactionId", txPayload.OriginalTransactionId))
 	return l.svcCtx.DB.Transaction(func(db *gorm.DB) error {
 		var existing *iapmodel.Transaction
 		existing, _ = iapmodel.NewModel(l.svcCtx.DB, l.svcCtx.Redis).FindByOriginalId(l.ctx, txPayload.OriginalTransactionId)
 		if existing == nil || existing.Id == 0 {
+			// 首次出现该事务，写入记录
 			rec := &iapmodel.Transaction{
 				UserId:                0,
 				OriginalTransactionId: txPayload.OriginalTransactionId,
@@ -43,35 +66,50 @@ func (l *AppleIAPNotifyLogic) Handle(signedPayload string) error {
 				JWSHash:               "",
 			}
 			if e := db.Model(&iapmodel.Transaction{}).Create(rec).Error; e != nil {
+				// 事务写入失败（唯一约束/字段问题），输出详细日志
+				l.Errorw("iap notify insert transaction error", logger.Field("error", e.Error()), logger.Field("productId", txPayload.ProductId), logger.Field("originalTransactionId", txPayload.OriginalTransactionId))
 				return e
 			}
 		} else {
 			if txPayload.RevocationDate != nil {
+				// 撤销场景：更新 revocation_at
 				if e := db.Model(&iapmodel.Transaction{}).
 					Where("original_transaction_id = ?", txPayload.OriginalTransactionId).
 					Update("revocation_at", txPayload.RevocationDate).Error; e != nil {
+					// 撤销更新失败，记录日志
+					l.Errorw("iap notify update revocation error", logger.Field("error", e.Error()), logger.Field("originalTransactionId", txPayload.OriginalTransactionId))
 					return e
 				}
 			}
 		}
 		pm, _ := iapapple.ParseProductMap(l.svcCtx.Config.Site.CustomData)
 		m := pm.Items[txPayload.ProductId]
+		// 若产品映射缺失，记录警告日志（不影响事务入库）
+		if m.DurationDays == 0 {
+			l.Errorw("iap notify product mapping missing", logger.Field("productId", txPayload.ProductId))
+		}
 		token := "iap:" + txPayload.OriginalTransactionId
 		sub, e := l.svcCtx.UserModel.FindOneSubscribeByToken(l.ctx, token)
 		if e == nil && sub != nil && sub.Id != 0 {
 			if txPayload.RevocationDate != nil {
+				// 撤销：订阅置为过期并记录完成时间
 				sub.Status = 3
 				t := *txPayload.RevocationDate
 				sub.FinishedAt = &t
 				sub.ExpireTime = t
 			} else if m.DurationDays > 0 {
+				// 正常：根据映射天数续期
 				exp := iapapple.CalcExpire(txPayload.PurchaseDate, m.DurationDays)
 				sub.ExpireTime = exp
 				sub.Status = 1
 			}
 			if e := l.svcCtx.UserModel.UpdateSubscribe(l.ctx, sub, db); e != nil {
+				// 订阅更新失败，记录日志
+				l.Errorw("iap notify update subscribe error", logger.Field("error", e.Error()), logger.Field("userSubscribeId", sub.Id))
 				return e
 			}
+			// 更新成功，输出订阅状态
+			l.Infow("iap notify updated subscribe", logger.Field("userSubscribeId", sub.Id), logger.Field("status", sub.Status))
 		}
 		return nil
 	})

internal/logic/public/iap/apple/attachTransactionByIdLogic.go

@@ -0,0 +1,72 @@
+package apple
+
+import (
+	"context"
+	"github.com/perfect-panel/server/internal/model/payment"
+	"github.com/perfect-panel/server/internal/svc"
+	"github.com/perfect-panel/server/internal/types"
+	"github.com/perfect-panel/server/pkg/constant"
+	iapapple "github.com/perfect-panel/server/pkg/iap/apple"
+	"github.com/perfect-panel/server/pkg/logger"
+	"github.com/perfect-panel/server/pkg/xerr"
+	"github.com/pkg/errors"
+)
+
+type AttachTransactionByIdLogic struct {
+	logger.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewAttachTransactionByIdLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AttachTransactionByIdLogic {
+	return &AttachTransactionByIdLogic{
+		Logger: logger.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *AttachTransactionByIdLogic) AttachById(req *types.AttachAppleTransactionByIdRequest) (*types.AttachAppleTransactionResponse, error) {
+	_, ok := l.ctx.Value(constant.CtxKeyUser).(*struct{ Id int64 })
+	if !ok {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "invalid access")
+	}
+	ord, err := l.svcCtx.OrderModel.FindOneByOrderNo(l.ctx, req.OrderNo)
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.OrderNotExist), "order not exist")
+	}
+	pay, err := l.svcCtx.PaymentModel.FindOne(l.ctx, ord.PaymentId)
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.PaymentMethodNotFound), "payment not found")
+	}
+	var cfg payment.AppleIAPConfig
+	if err := cfg.Unmarshal([]byte(pay.Config)); err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "iap config error")
+	}
+	apiCfg := iapapple.ServerAPIConfig{
+		KeyID:      cfg.KeyID,
+		IssuerID:   cfg.IssuerID,
+		PrivateKey: cfg.PrivateKey,
+		Sandbox:    cfg.Sandbox,
+	}
+	if req.Sandbox != nil {
+		apiCfg.Sandbox = *req.Sandbox
+	}
+	if apiCfg.KeyID == "" || apiCfg.IssuerID == "" || apiCfg.PrivateKey == "" {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "apple server api credential missing")
+	}
+	jws, err := iapapple.GetTransactionInfo(apiCfg, req.TransactionId)
+	if err != nil {
+		l.Errorw("fetch transaction info error", logger.Field("error", err.Error()))
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "fetch transaction info error")
+	}
+	// reuse existing attach logic with JWS
+	attach := NewAttachTransactionLogic(l.ctx, l.svcCtx)
+	return attach.Attach(&types.AttachAppleTransactionRequest{
+		SignedTransactionJWS: jws,
+		SubscribeId:          0,
+		DurationDays:         0,
+		Tier:                 "",
+		OrderNo:              req.OrderNo,
+	})
+}

internal/model/payment/payment.go

@@ -127,3 +127,26 @@ func (l *CryptoSaaSConfig) Unmarshal(data []byte) error {
 	aux := (*Alias)(l)
 	return json.Unmarshal(data, &aux)
 }
+
+type AppleIAPConfig struct {
+	ProductIds []string `json:"product_ids"`
+	KeyID      string   `json:"key_id"`
+	IssuerID   string   `json:"issuer_id"`
+	PrivateKey string   `json:"private_key"`
+	Sandbox    bool     `json:"sandbox"`
+}
+
+func (l *AppleIAPConfig) Marshal() ([]byte, error) {
+	type Alias AppleIAPConfig
+	return json.Marshal(&struct {
+		*Alias
+	}{
+		Alias: (*Alias)(l),
+	})
+}
+
+func (l *AppleIAPConfig) Unmarshal(data []byte) error {
+	type Alias AppleIAPConfig
+	aux := (*Alias)(l)
+	return json.Unmarshal(data, &aux)
+}

internal/types/types.go

@@ -2873,6 +2873,11 @@ type AttachAppleTransactionResponse struct {
 	Tier      string `json:"tier"`
 }
 
+type AttachAppleTransactionByIdRequest struct {
+	TransactionId string `json:"transaction_id" validate:"required"`
+	OrderNo       string `json:"order_no" validate:"required"`
+	Sandbox       *bool  `json:"sandbox,omitempty"`
+}
 type RestoreAppleTransactionsRequest struct {
 	Transactions []string `json:"transactions" validate:"required"`
 }

pkg/iap/apple/jws.go

@@ -8,14 +8,25 @@ import (
 	"encoding/json"
 	"strings"
 	"time"
+	"unicode"
 )
 
+func cleanB64(s string) string {
+	trimmed := strings.TrimSpace(s)
+	return strings.Map(func(r rune) rune {
+		if unicode.IsSpace(r) {
+			return -1
+		}
+		return r
+	}, trimmed)
+}
+
 func ParseTransactionJWS(jws string) (*TransactionPayload, error) {
-	parts := strings.Split(jws, ".")
+	parts := strings.Split(strings.TrimSpace(jws), ".")
 	if len(parts) != 3 {
 		return nil, ErrInvalidJWS
 	}
-	payloadB64 := parts[1]
+	payloadB64 := cleanB64(parts[1])
 	// add padding if required
 	switch len(payloadB64) % 4 {
 	case 2:
@@ -63,11 +74,11 @@ type jwsHeader struct {
 }
 
 func VerifyTransactionJWS(jws string) (*TransactionPayload, error) {
-	parts := strings.Split(jws, ".")
+	parts := strings.Split(strings.TrimSpace(jws), ".")
 	if len(parts) != 3 {
 		return nil, ErrInvalidJWS
 	}
-	hdrB64 := parts[0]
+	hdrB64 := cleanB64(parts[0])
 	switch len(hdrB64) % 4 {
 	case 2:
 		hdrB64 += "=="
@@ -97,13 +108,14 @@ func VerifyTransactionJWS(jws string) (*TransactionPayload, error) {
 	if !ok {
 		return nil, ErrInvalidJWS
 	}
-	signingInput := parts[0] + "." + parts[1]
-	sig, err := base64.RawURLEncoding.DecodeString(parts[2])
+	signingInput := cleanB64(parts[0]) + "." + cleanB64(parts[1])
+	sig := cleanB64(parts[2])
+	sigBytes, err := base64.RawURLEncoding.DecodeString(sig)
 	if err != nil {
 		return nil, err
 	}
 	d := sha256.Sum256([]byte(signingInput))
-	if !ecdsa.VerifyASN1(pub, d[:], sig) {
+	if !ecdsa.VerifyASN1(pub, d[:], sigBytes) {
 		return nil, ErrInvalidJWS
 	}
 	return ParseTransactionJWS(jws)

pkg/iap/apple/notification.go

@@ -12,11 +12,11 @@ type NotificationEnvelope struct {
 }
 
 func ParseNotificationSignedPayload(jws string) (*NotificationEnvelope, error) {
-	parts := strings.Split(jws, ".")
+	parts := strings.Split(strings.TrimSpace(jws), ".")
 	if len(parts) != 3 {
 		return nil, ErrInvalidJWS
 	}
-	payloadB64 := parts[1]
+	payloadB64 := cleanB64(parts[1])
 	switch len(payloadB64) % 4 {
 	case 2:
 		payloadB64 += "=="

pkg/iap/apple/serverapi.go

@@ -0,0 +1,112 @@
+package apple
+
+import (
+	"bytes"
+	"crypto/ecdsa"
+	"crypto/rand"
+	"crypto/sha256"
+	"crypto/x509"
+	"encoding/base64"
+	"encoding/json"
+	"encoding/pem"
+	"fmt"
+	"net/http"
+	"time"
+)
+
+type ServerAPIConfig struct {
+	KeyID      string
+	IssuerID   string
+	PrivateKey string
+	Sandbox    bool
+}
+
+func buildAPIToken(cfg ServerAPIConfig) (string, error) {
+	header := map[string]string{
+		"alg": "ES256",
+		"kid": cfg.KeyID,
+		"typ": "JWT",
+	}
+	now := time.Now().Unix()
+	payload := map[string]interface{}{
+		"iss": cfg.IssuerID,
+		"iat": now,
+		"exp": now + 1800,
+		"aud": "appstoreconnect-v1",
+	}
+	hb, _ := json.Marshal(header)
+	pb, _ := json.Marshal(payload)
+	enc := func(b []byte) string {
+		return base64.RawURLEncoding.EncodeToString(b)
+	}
+	unsigned := fmt.Sprintf("%s.%s", enc(hb), enc(pb))
+	block, _ := pem.Decode([]byte(cfg.PrivateKey))
+	if block == nil {
+		return "", fmt.Errorf("invalid private key")
+	}
+	keyAny, err := x509.ParsePKCS8PrivateKey(block.Bytes)
+	if err != nil {
+		return "", err
+	}
+	priv, ok := keyAny.(*ecdsa.PrivateKey)
+	if !ok {
+		return "", fmt.Errorf("private key is not ECDSA")
+	}
+	hash := unsigned // ES256 signs SHA-256 of input; jwt libs do hashing, we implement manually
+	digest := sha256Sum([]byte(hash))
+	sig, err := ecdsa.SignASN1(rand.Reader, priv, digest)
+	if err != nil {
+		return "", err
+	}
+	return unsigned + "." + base64.RawURLEncoding.EncodeToString(sig), nil
+}
+
+func sha256Sum(b []byte) []byte {
+	h := sha256.New()
+	h.Write(b)
+	return h.Sum(nil)
+}
+
+func GetTransactionInfo(cfg ServerAPIConfig, transactionId string) (string, error) {
+	token, err := buildAPIToken(cfg)
+	if err != nil {
+		return "", err
+	}
+	try := func(host string) (string, int, string, error) {
+		url := fmt.Sprintf("%s/inApps/v1/transactions/%s", host, transactionId)
+		req, _ := http.NewRequest("GET", url, nil)
+		req.Header.Set("Authorization", "Bearer "+token)
+		resp, err := http.DefaultClient.Do(req)
+		if err != nil {
+			return "", 0, "", err
+		}
+		defer resp.Body.Close()
+		buf := new(bytes.Buffer)
+		_, _ = buf.ReadFrom(resp.Body)
+		if resp.StatusCode != 200 {
+			return "", resp.StatusCode, buf.String(), fmt.Errorf("apple api error: %d", resp.StatusCode)
+		}
+		var body struct {
+			SignedTransactionInfo string `json:"signedTransactionInfo"`
+		}
+		if err := json.Unmarshal(buf.Bytes(), &body); err != nil {
+			return "", resp.StatusCode, buf.String(), err
+		}
+		return body.SignedTransactionInfo, resp.StatusCode, buf.String(), nil
+	}
+	primary := "https://api.storekit.itunes.apple.com"
+	secondary := "https://api.storekit-sandbox.itunes.apple.com"
+	if cfg.Sandbox {
+		primary, secondary = secondary, primary
+	}
+	jws, code, body, err := try(primary)
+	if err == nil && jws != "" {
+		return jws, nil
+	}
+	// Fallback to the other environment if primary failed (common when env mismatches)
+	jws2, code2, body2, err2 := try(secondary)
+	if err2 == nil && jws2 != "" {
+		return jws2, nil
+	}
+	return "", fmt.Errorf("apple api error, primary[%d:%s], secondary[%d:%s]", code, body, code2, body2)
+}