HI-VPN/hi-server
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 单订阅模式激活时赠送订阅也用受益者 ID 查找
All checks were successful
Build docker and publish / build (20.15.1) (push) Successful in 7m21s
Details

Browse Source 
findGiftSubscription 同步改用 singleModeUserId
（家庭组场景为家庭主 ID），与锚点订阅查找保持一致。

Co-Authored-By: claude-flow <ruv@ruv.net>
This commit is contained in:
shanshanzhong 2026-03-31 06:10:58 -07:00
parent 3167465865
commit 0b1e6ce3c3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
queue/logic/order/activateOrderLogic.go
View File

@ -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)