From 0b1e6ce3c309a291c3ecbed1fcd8a40eda29cbfb Mon Sep 17 00:00:00 2001 From: shanshanzhong Date: Tue, 31 Mar 2026 06:10:58 -0700 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8D=95=E8=AE=A2=E9=98=85=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E6=BF=80=E6=B4=BB=E6=97=B6=E8=B5=A0=E9=80=81=E8=AE=A2?= =?UTF-8?q?=E9=98=85=E4=B9=9F=E7=94=A8=E5=8F=97=E7=9B=8A=E8=80=85=20ID=20?= =?UTF-8?q?=E6=9F=A5=E6=89=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit findGiftSubscription 同步改用 singleModeUserId （家庭组场景为家庭主 ID），与锚点订阅查找保持一致。 Co-Authored-By: claude-flow --- queue/logic/order/activateOrderLogic.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/queue/logic/order/activateOrderLogic.go b/queue/logic/order/activateOrderLogic.go index f8d84a5..9c4afdb 100644 --- a/queue/logic/order/activateOrderLogic.go +++ b/queue/logic/order/activateOrderLogic.go @@ -276,7 +276,7 @@ func (l *ActivateOrderLogic) NewPurchase(ctx context.Context, orderInfo *order.O // 如果没有合并已购订阅，再尝试合并赠送订阅（order_id=0） if userSub == nil { - giftSub, giftErr := l.findGiftSubscription(ctx, orderInfo.UserId, orderInfo.SubscribeId) + giftSub, giftErr := l.findGiftSubscription(ctx, singleModeUserId, orderInfo.SubscribeId) if giftErr == nil && giftSub != nil { // 在赠送订阅上延长时间，保持 token 不变 userSub, err = l.extendGiftSubscription(ctx, giftSub, orderInfo, sub)