feat: subscription plan group restriction

model/subscription.go

@@ -952,8 +952,29 @@ func maybeResetUserSubscriptionWithPlanTx(tx *gorm.DB, sub *UserSubscription, pl
 	return tx.Save(sub).Error
 }
 
+func subscriptionMatchesModelGroup(sub *UserSubscription, modelName string, usingGroup string) bool {
+	if sub == nil {
+		return false
+	}
+	upgradeGroup := strings.TrimSpace(sub.UpgradeGroup)
+	if upgradeGroup == "" {
+		return true
+	}
+	usingGroup = strings.TrimSpace(usingGroup)
+	if usingGroup != "" && usingGroup != "auto" {
+		return usingGroup == upgradeGroup
+	}
+	modelGroups := GetModelEnableGroups(modelName)
+	for _, group := range modelGroups {
+		if strings.TrimSpace(group) == upgradeGroup {
+			return true
+		}
+	}
+	return false
+}
+
 // PreConsumeUserSubscription pre-consumes from any active subscription total quota.
-func PreConsumeUserSubscription(requestId string, userId int, modelName string, quotaType int, amount int64) (*SubscriptionPreConsumeResult, error) {
+func PreConsumeUserSubscription(requestId string, userId int, modelName string, usingGroup string, quotaType int, amount int64) (*SubscriptionPreConsumeResult, error) {
 	if userId <= 0 {
 		return nil, errors.New("invalid userId")
 	}
@@ -999,8 +1020,13 @@ func PreConsumeUserSubscription(requestId string, userId int, modelName string,
 		if len(subs) == 0 {
 			return errors.New("no active subscription")
 		}
+		hasMatchedSubscription := false
 		for _, candidate := range subs {
 			sub := candidate
+			if !subscriptionMatchesModelGroup(&sub, modelName, usingGroup) {
+				continue
+			}
+			hasMatchedSubscription = true
 			plan, err := getSubscriptionPlanByIdTx(tx, sub.PlanId)
 			if err != nil {
 				return err
@@ -1048,6 +1074,9 @@ func PreConsumeUserSubscription(requestId string, userId int, modelName string,
 			returnValue.AmountUsedAfter = sub.AmountUsed
 			return nil
 		}
+		if !hasMatchedSubscription {
+			return errors.New("no active subscription")
+		}
 		return fmt.Errorf("subscription quota insufficient, need=%d", amount)
 	})
 	if err != nil {

service/billing_session.go

@@ -297,10 +297,11 @@ func NewBillingSession(c *gin.Context, relayInfo *relaycommon.RelayInfo, preCons
 		session := &BillingSession{
 			relayInfo: relayInfo,
 			funding: &SubscriptionFunding{
-				requestId: relayInfo.RequestId,
-				userId:    relayInfo.UserId,
-				modelName: relayInfo.OriginModelName,
-				amount:    subConsume,
+				requestId:  relayInfo.RequestId,
+				userId:     relayInfo.UserId,
+				modelName:  relayInfo.OriginModelName,
+				usingGroup: relayInfo.UsingGroup,
+				amount:     subConsume,
 			},
 		}
 		// 必须传 subConsume 而非 preConsumedQuota，保证 SubscriptionFunding.amount、

service/funding_source.go

@@ -71,6 +71,7 @@ type SubscriptionFunding struct {
 	requestId      string
 	userId         int
 	modelName      string
+	usingGroup     string
 	amount         int64 // 预扣的订阅额度（subConsume）
 	subscriptionId int
 	preConsumed    int64
@@ -85,7 +86,7 @@ func (s *SubscriptionFunding) Source() string { return BillingSourceSubscription
 
 func (s *SubscriptionFunding) PreConsume(_ int) error {
 	// amount 参数被忽略，使用内部 s.amount（已在构造时根据 preConsumedQuota 计算）
-	res, err := model.PreConsumeUserSubscription(s.requestId, s.userId, s.modelName, 0, s.amount)
+	res, err := model.PreConsumeUserSubscription(s.requestId, s.userId, s.modelName, s.usingGroup, 0, s.amount)
 	if err != nil {
 		return err
 	}