feat: 苹果支付uuid 及设备逻辑

2026-03-10 19:53:19 -07:00
parent 662ef6edb3
commit 26f6400e74
10 changed files with 142 additions and 25 deletions
@@ -471,8 +471,15 @@ func (l *ActivateOrderLogic) getSubscribeInfo(ctx context.Context, subscribeId i
 // createUserSubscription creates a new user subscription record based on order and subscription plan details
 func (l *ActivateOrderLogic) createUserSubscription(ctx context.Context, orderInfo *order.Order, sub *subscribe.Subscribe) (*user.Subscribe, error) {
 	now := time.Now()
+
+	// Determine subscription owner: use SubscriptionUserId if set, otherwise fall back to UserId
+	subscriptionUserId := orderInfo.UserId
+	if orderInfo.SubscriptionUserId > 0 {
+		subscriptionUserId = orderInfo.SubscriptionUserId
+	}
+
 	userSub := &user.Subscribe{
-		UserId:      orderInfo.UserId,
+		UserId:      subscriptionUserId,
 		OrderId:     orderInfo.Id,
 		SubscribeId: orderInfo.SubscribeId,
 		StartTime:   now,