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

add: 新增ci diamanté

Browse Source
This commit is contained in:
shanshanzhong
2026-03-03 17:29:45 -08:00
parent d220516183
commit b0eb6595ac
16 changed files with 996 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
queue/logic/order/activateOrderLogic.go
+63 -11
View File
@@ -225,19 +225,67 @@ func (l *ActivateOrderLogic) NewPurchase(ctx context.Context, orderInfo *order.O
var userSub *user.Subscribe
// 单订阅模式下，检查用户是否已有赠送订阅（order_id=0）
// 单订阅模式下，优先兜底为“续费语义”：延长已购订阅，避免并发下重复创建 user_subscribe
if l.svc.Config.Subscribe.SingleModel {
giftSub, err := l.findGiftSubscription(ctx, orderInfo.UserId, orderInfo.SubscribeId)
if err == nil && giftSub != nil {
// 在赠送订阅上延长时间，保持 token 不变
userSub, err = l.extendGiftSubscription(ctx, giftSub, orderInfo, sub)
if err != nil {
logger.WithContext(ctx).Error("Extend gift subscription failed",
logger.Field("error", err.Error()),
logger.Field("gift_subscribe_id", giftSub.Id),
anchorSub, anchorErr := l.svc.UserModel.FindSingleModeAnchorSubscribe(ctx, orderInfo.UserId)
switch {
case anchorErr == nil && anchorSub != nil:
if anchorSub.SubscribeId == orderInfo.SubscribeId {
if orderInfo.ParentId == 0 && anchorSub.OrderId > 0 && anchorSub.OrderId != orderInfo.Id {
if patchErr := l.patchOrderParentID(ctx, orderInfo.Id, anchorSub.OrderId); patchErr != nil {
logger.WithContext(ctx).Error("Patch order parent_id failed",
logger.Field("error", patchErr.Error()),
logger.Field("order_no", orderInfo.OrderNo),
)
} else {
orderInfo.ParentId = anchorSub.OrderId
}
}
if renewErr := l.updateSubscriptionForRenewal(ctx, anchorSub, sub, orderInfo); renewErr != nil {
logger.WithContext(ctx).Error("Single mode renewal fallback failed",
logger.Field("error", renewErr.Error()),
logger.Field("anchor_user_subscribe_id", anchorSub.Id),
logger.Field("order_no", orderInfo.OrderNo),
)
} else {
userSub = anchorSub
logger.WithContext(ctx).Infow("Single mode purchase routed to renewal in activation",
logger.Field("mode", "single"),
logger.Field("route", "purchase_to_renewal"),
logger.Field("anchor_user_subscribe_id", anchorSub.Id),
logger.Field("order_no", orderInfo.OrderNo),
)
}
} else {
logger.WithContext(ctx).Errorw("Single mode anchor subscribe mismatch in activation",
logger.Field("order_no", orderInfo.OrderNo),
logger.Field("order_subscribe_id", orderInfo.SubscribeId),
logger.Field("anchor_subscribe_id", anchorSub.SubscribeId),
)
// 合并失败时回退到创建新订阅
userSub = nil
}
case errors.Is(anchorErr, gorm.ErrRecordNotFound):
case anchorErr != nil:
logger.WithContext(ctx).Error("Find single mode anchor subscribe failed",
logger.Field("error", anchorErr.Error()),
logger.Field("order_no", orderInfo.OrderNo),
)
}
// 如果没有合并已购订阅，再尝试合并赠送订阅（order_id=0）
if userSub == nil {
giftSub, giftErr := l.findGiftSubscription(ctx, orderInfo.UserId, orderInfo.SubscribeId)
if giftErr == nil && giftSub != nil {
// 在赠送订阅上延长时间，保持 token 不变
userSub, err = l.extendGiftSubscription(ctx, giftSub, orderInfo, sub)
if err != nil {
logger.WithContext(ctx).Error("Extend gift subscription failed",
logger.Field("error", err.Error()),
logger.Field("gift_subscribe_id", giftSub.Id),
)
// 合并失败时回退到创建新订阅
userSub = nil
}
}
}
}
@@ -439,6 +487,10 @@ func (l *ActivateOrderLogic) createUserSubscription(ctx context.Context, orderIn
return userSub, nil
}
func (l *ActivateOrderLogic) patchOrderParentID(ctx context.Context, orderID int64, parentID int64) error {
return l.svc.DB.WithContext(ctx).Model(&order.Order{}).Where("id = ? AND (parent_id = 0 OR parent_id IS NULL)", orderID).Update("parent_id", parentID).Error
}
// findGiftSubscription 查找用户指定套餐的赠送订阅（order_id=0），包括已过期的
// 返回找到的赠送订阅记录，如果没有则返回 nil
func (l *ActivateOrderLogic) findGiftSubscription(ctx context.Context, userId int64, subscribeId int64) (*user.Subscribe, error) {