feat(channel): 缓存扁平化 + 网关映射集成 + 计费模式统一 + 模型限制

- 缓存重构为 O(1) 哈希结构 (pricingByGroupModel, mappingByGroupModel)
- 渠道模型映射接入网关流程 (Forward 前应用, a→b→c 映射链)
- 新增 billing_model_source 配置 (请求模型/最终模型计费)
- usage_logs 新增 channel_id, model_mapping_chain, billing_tier 字段
- 每种计费模式统一支持默认价格 + 区间定价
- 渠道模型限制开关 (restrict_models)
- 分组按平台分类展示 + 彩色图标
- 必填字段红色星号 + 模型映射 UI
- 去除模型通配符支持

backend/ent/schema/usage_log.go

@@ -53,6 +53,9 @@ func (UsageLog) Fields() []ent.Field {
 			MaxLen(100).
 			Optional().
 			Nillable(),
+		field.Int64("channel_id").Optional().Nillable().Comment("渠道 ID"),
+		field.String("model_mapping_chain").MaxLen(500).Optional().Nillable().Comment("模型映射链"),
+		field.String("billing_tier").MaxLen(50).Optional().Nillable().Comment("计费层级标签"),
 		field.Int64("group_id").
 			Optional().
 			Nillable(),

backend/internal/handler/admin/channel_handler.go

@@ -24,31 +24,36 @@ func NewChannelHandler(channelService *service.ChannelService) *ChannelHandler {
 // --- Request / Response types ---
 
 type createChannelRequest struct {
-	Name         string                         `json:"name" binding:"required,max=100"`
+	Name               string                         `json:"name" binding:"required,max=100"`
-	Description  string                         `json:"description"`
+	Description        string                         `json:"description"`
-	GroupIDs     []int64                        `json:"group_ids"`
+	GroupIDs           []int64                        `json:"group_ids"`
-	ModelPricing []channelModelPricingRequest   `json:"model_pricing"`
+	ModelPricing       []channelModelPricingRequest   `json:"model_pricing"`
-	ModelMapping map[string]string              `json:"model_mapping"`
+	ModelMapping       map[string]string              `json:"model_mapping"`
+	BillingModelSource string                         `json:"billing_model_source" binding:"omitempty,oneof=requested upstream"`
+	RestrictModels     bool                           `json:"restrict_models"`
 }
 
 type updateChannelRequest struct {
-	Name         string                          `json:"name" binding:"omitempty,max=100"`
+	Name               string                          `json:"name" binding:"omitempty,max=100"`
-	Description  *string                         `json:"description"`
+	Description        *string                         `json:"description"`
-	Status       string                          `json:"status" binding:"omitempty,oneof=active disabled"`
+	Status             string                          `json:"status" binding:"omitempty,oneof=active disabled"`
-	GroupIDs     *[]int64                        `json:"group_ids"`
+	GroupIDs           *[]int64                        `json:"group_ids"`
-	ModelPricing *[]channelModelPricingRequest   `json:"model_pricing"`
+	ModelPricing       *[]channelModelPricingRequest   `json:"model_pricing"`
-	ModelMapping map[string]string               `json:"model_mapping"`
+	ModelMapping       map[string]string               `json:"model_mapping"`
+	BillingModelSource string                          `json:"billing_model_source" binding:"omitempty,oneof=requested upstream"`
+	RestrictModels     *bool                           `json:"restrict_models"`
 }
 
 type channelModelPricingRequest struct {
-	Models           []string                 `json:"models" binding:"required,min=1,max=100"`
+	Models           []string                   `json:"models" binding:"required,min=1,max=100"`
-	BillingMode      string                   `json:"billing_mode" binding:"omitempty,oneof=token per_request image"`
+	BillingMode      string                     `json:"billing_mode" binding:"omitempty,oneof=token per_request image"`
-	InputPrice       *float64                 `json:"input_price" binding:"omitempty,min=0"`
+	InputPrice       *float64                   `json:"input_price" binding:"omitempty,min=0"`
-	OutputPrice      *float64                 `json:"output_price" binding:"omitempty,min=0"`
+	OutputPrice      *float64                   `json:"output_price" binding:"omitempty,min=0"`
-	CacheWritePrice  *float64                 `json:"cache_write_price" binding:"omitempty,min=0"`
+	CacheWritePrice  *float64                   `json:"cache_write_price" binding:"omitempty,min=0"`
-	CacheReadPrice   *float64                 `json:"cache_read_price" binding:"omitempty,min=0"`
+	CacheReadPrice   *float64                   `json:"cache_read_price" binding:"omitempty,min=0"`
-	ImageOutputPrice *float64                 `json:"image_output_price" binding:"omitempty,min=0"`
+	ImageOutputPrice *float64                   `json:"image_output_price" binding:"omitempty,min=0"`
-	Intervals        []pricingIntervalRequest `json:"intervals"`
+	PerRequestPrice  *float64                   `json:"per_request_price" binding:"omitempty,min=0"`
+	Intervals        []pricingIntervalRequest   `json:"intervals"`
 }
 
 type pricingIntervalRequest struct {
@@ -64,27 +69,30 @@ type pricingIntervalRequest struct {
 }
 
 type channelResponse struct {
-	ID           int64                          `json:"id"`
+	ID                 int64                          `json:"id"`
-	Name         string                         `json:"name"`
+	Name               string                         `json:"name"`
-	Description  string                         `json:"description"`
+	Description        string                         `json:"description"`
-	Status       string                         `json:"status"`
+	Status             string                         `json:"status"`
-	GroupIDs     []int64                        `json:"group_ids"`
+	BillingModelSource string                         `json:"billing_model_source"`
-	ModelPricing []channelModelPricingResponse  `json:"model_pricing"`
+	RestrictModels     bool                           `json:"restrict_models"`
-	ModelMapping map[string]string              `json:"model_mapping"`
+	GroupIDs           []int64                        `json:"group_ids"`
-	CreatedAt    string                         `json:"created_at"`
+	ModelPricing       []channelModelPricingResponse  `json:"model_pricing"`
-	UpdatedAt    string                         `json:"updated_at"`
+	ModelMapping       map[string]string              `json:"model_mapping"`
+	CreatedAt          string                         `json:"created_at"`
+	UpdatedAt          string                         `json:"updated_at"`
 }
 
 type channelModelPricingResponse struct {
-	ID               int64                     `json:"id"`
+	ID               int64                       `json:"id"`
-	Models           []string                  `json:"models"`
+	Models           []string                    `json:"models"`
-	BillingMode      string                    `json:"billing_mode"`
+	BillingMode      string                      `json:"billing_mode"`
-	InputPrice       *float64                  `json:"input_price"`
+	InputPrice       *float64                    `json:"input_price"`
-	OutputPrice      *float64                  `json:"output_price"`
+	OutputPrice      *float64                    `json:"output_price"`
-	CacheWritePrice  *float64                  `json:"cache_write_price"`
+	CacheWritePrice  *float64                    `json:"cache_write_price"`
-	CacheReadPrice   *float64                  `json:"cache_read_price"`
+	CacheReadPrice   *float64                    `json:"cache_read_price"`
-	ImageOutputPrice *float64                  `json:"image_output_price"`
+	ImageOutputPrice *float64                    `json:"image_output_price"`
-	Intervals        []pricingIntervalResponse `json:"intervals"`
+	PerRequestPrice  *float64                    `json:"per_request_price"`
+	Intervals        []pricingIntervalResponse   `json:"intervals"`
 }
 
 type pricingIntervalResponse struct {
@@ -109,11 +117,16 @@ func channelToResponse(ch *service.Channel) *channelResponse {
 		Name:        ch.Name,
 		Description: ch.Description,
 		Status:      ch.Status,
+		RestrictModels: ch.RestrictModels,
 		GroupIDs:     ch.GroupIDs,
 		ModelMapping: ch.ModelMapping,
 		CreatedAt:   ch.CreatedAt.Format("2006-01-02T15:04:05Z"),
 		UpdatedAt:   ch.UpdatedAt.Format("2006-01-02T15:04:05Z"),
 	}
+	resp.BillingModelSource = ch.BillingModelSource
+	if resp.BillingModelSource == "" {
+		resp.BillingModelSource = "requested"
+	}
 	if resp.GroupIDs == nil {
 		resp.GroupIDs = []int64{}
 	}
@@ -155,6 +168,7 @@ func channelToResponse(ch *service.Channel) *channelResponse {
 			CacheWritePrice:  p.CacheWritePrice,
 			CacheReadPrice:   p.CacheReadPrice,
 			ImageOutputPrice: p.ImageOutputPrice,
+			PerRequestPrice:  p.PerRequestPrice,
 			Intervals:        intervals,
 		})
 	}
@@ -190,6 +204,7 @@ func pricingRequestToService(reqs []channelModelPricingRequest) []service.Channe
 			CacheWritePrice:  r.CacheWritePrice,
 			CacheReadPrice:   r.CacheReadPrice,
 			ImageOutputPrice: r.ImageOutputPrice,
+			PerRequestPrice:  r.PerRequestPrice,
 			Intervals:        intervals,
 		})
 	}
@@ -249,11 +264,13 @@ func (h *ChannelHandler) Create(c *gin.Context) {
 	}
 
 	channel, err := h.channelService.Create(c.Request.Context(), &service.CreateChannelInput{
-		Name:         req.Name,
+		Name:               req.Name,
-		Description:  req.Description,
+		Description:        req.Description,
-		GroupIDs:     req.GroupIDs,
+		GroupIDs:            req.GroupIDs,
-		ModelPricing: pricingRequestToService(req.ModelPricing),
+		ModelPricing:        pricingRequestToService(req.ModelPricing),
-		ModelMapping: req.ModelMapping,
+		ModelMapping:        req.ModelMapping,
+		BillingModelSource: req.BillingModelSource,
+		RestrictModels:     req.RestrictModels,
 	})
 	if err != nil {
 		response.ErrorFrom(c, err)
@@ -279,11 +296,13 @@ func (h *ChannelHandler) Update(c *gin.Context) {
 	}
 
 	input := &service.UpdateChannelInput{
-		Name:         req.Name,
+		Name:               req.Name,
-		Description:  req.Description,
+		Description:        req.Description,
-		Status:       req.Status,
+		Status:             req.Status,
-		GroupIDs:     req.GroupIDs,
+		GroupIDs:            req.GroupIDs,
-		ModelMapping: req.ModelMapping,
+		ModelMapping:        req.ModelMapping,
+		BillingModelSource: req.BillingModelSource,
+		RestrictModels:     req.RestrictModels,
 	}
 	if req.ModelPricing != nil {
 		pricing := pricingRequestToService(*req.ModelPricing)

backend/internal/handler/dto/mappers.go

@@ -604,6 +604,9 @@ func UsageLogFromServiceAdmin(l *service.UsageLog) *AdminUsageLog {
 	return &AdminUsageLog{
 		UsageLog:              usageLogFromServiceUser(l),
 		UpstreamModel:         l.UpstreamModel,
+		ChannelID:             l.ChannelID,
+		ModelMappingChain:     l.ModelMappingChain,
+		BillingTier:           l.BillingTier,
 		AccountRateMultiplier: l.AccountRateMultiplier,
 		IPAddress:             l.IPAddress,
 		Account:               AccountSummaryFromService(l.Account),

backend/internal/handler/dto/types.go

@@ -406,6 +406,13 @@ type AdminUsageLog struct {
 	// Omitted when no mapping was applied (requested model was used as-is).
 	UpstreamModel *string `json:"upstream_model,omitempty"`
 
+	// ChannelID 渠道 ID
+	ChannelID *int64 `json:"channel_id,omitempty"`
+	// ModelMappingChain 模型映射链，如 "a→b→c"
+	ModelMappingChain *string `json:"model_mapping_chain,omitempty"`
+	// BillingTier 计费层级标签（per_request/image 模式）
+	BillingTier *string `json:"billing_tier,omitempty"`
+
 	// AccountRateMultiplier 账号计费倍率快照（nil 表示按 1.0 处理）
 	AccountRateMultiplier *float64 `json:"account_rate_multiplier"`
 

backend/internal/handler/gateway_handler.go

@@ -158,6 +158,24 @@ func (h *GatewayHandler) Messages(c *gin.Context) {
 	reqStream := parsedReq.Stream
 	reqLog = reqLog.With(zap.String("model", reqModel), zap.Bool("stream", reqStream))
 
+	// 解析渠道级模型映射
+	var channelMapping service.ChannelMappingResult
+	if apiKey.GroupID != nil {
+		channelMapping = h.gatewayService.ResolveChannelMapping(c.Request.Context(), *apiKey.GroupID, reqModel)
+	}
+
+	// 渠道模型限制检查
+	if apiKey.GroupID != nil {
+		checkModel := reqModel
+		if channelMapping.Mapped {
+			checkModel = channelMapping.MappedModel
+		}
+		if h.gatewayService.IsModelRestricted(c.Request.Context(), *apiKey.GroupID, checkModel) {
+			h.errorResponse(c, http.StatusForbidden, "invalid_request_error", "Model not available in current channel: "+reqModel)
+			return
+		}
+	}
+
 	// 设置 max_tokens=1 + haiku 探测请求标识到 context 中
 	// 必须在 SetClaudeCodeClientContext 之前设置，因为 ClaudeCodeValidator 需要读取此标识进行绕过判断
 	if isMaxTokensOneHaikuRequest(reqModel, parsedReq.MaxTokens, reqStream) {
@@ -478,6 +496,21 @@ func (h *GatewayHandler) Messages(c *gin.Context) {
 					RequestPayloadHash: requestPayloadHash,
 					ForceCacheBilling:  fs.ForceCacheBilling,
 					APIKeyService:      h.apiKeyService,
+					ChannelID:          channelMapping.ChannelID,
+					OriginalModel:      reqModel,
+					BillingModelSource: channelMapping.BillingModelSource,
+					ModelMappingChain: func() string {
+						if !channelMapping.Mapped {
+							if result.UpstreamModel != "" && result.UpstreamModel != result.Model {
+								return reqModel + "→" + result.UpstreamModel
+							}
+							return ""
+						}
+						if result.UpstreamModel != "" && result.UpstreamModel != channelMapping.MappedModel {
+							return reqModel + "→" + channelMapping.MappedModel + "→" + result.UpstreamModel
+						}
+						return reqModel + "→" + channelMapping.MappedModel
+					}(),
 				}); err != nil {
 					logger.L().With(
 						zap.String("component", "handler.gateway.messages"),
@@ -660,6 +693,13 @@ func (h *GatewayHandler) Messages(c *gin.Context) {
 			parsedReq.OnUpstreamAccepted = queueRelease
 			// ===== 用户消息串行队列 END =====
 
+			// 应用渠道模型映射到请求
+			if channelMapping.Mapped {
+				parsedReq.Model = channelMapping.MappedModel
+				parsedReq.Body = h.gatewayService.ReplaceModelInBody(parsedReq.Body, channelMapping.MappedModel)
+				body = h.gatewayService.ReplaceModelInBody(body, channelMapping.MappedModel)
+			}
+
 			// 转发请求 - 根据账号平台分流
 			var result *service.ForwardResult
 			requestCtx := c.Request.Context()
@@ -810,6 +850,21 @@ func (h *GatewayHandler) Messages(c *gin.Context) {
 					RequestPayloadHash: requestPayloadHash,
 					ForceCacheBilling:  fs.ForceCacheBilling,
 					APIKeyService:      h.apiKeyService,
+					ChannelID:          channelMapping.ChannelID,
+					OriginalModel:      reqModel,
+					BillingModelSource: channelMapping.BillingModelSource,
+					ModelMappingChain: func() string {
+						if !channelMapping.Mapped {
+							if result.UpstreamModel != "" && result.UpstreamModel != result.Model {
+								return reqModel + "→" + result.UpstreamModel
+							}
+							return ""
+						}
+						if result.UpstreamModel != "" && result.UpstreamModel != channelMapping.MappedModel {
+							return reqModel + "→" + channelMapping.MappedModel + "→" + result.UpstreamModel
+						}
+						return reqModel + "→" + channelMapping.MappedModel
+					}(),
 				}); err != nil {
 					logger.L().With(
 						zap.String("component", "handler.gateway.messages"),

backend/internal/repository/channel_repo.go

@@ -42,9 +42,9 @@ func (r *channelRepository) Create(ctx context.Context, channel *service.Channel
 			return err
 		}
 		err = tx.QueryRowContext(ctx,
-			`INSERT INTO channels (name, description, status, model_mapping) VALUES ($1, $2, $3, $4)
+			`INSERT INTO channels (name, description, status, model_mapping, billing_model_source, restrict_models) VALUES ($1, $2, $3, $4, $5, $6)
 			 RETURNING id, created_at, updated_at`,
-			channel.Name, channel.Description, channel.Status, modelMappingJSON,
+			channel.Name, channel.Description, channel.Status, modelMappingJSON, channel.BillingModelSource, channel.RestrictModels,
 		).Scan(&channel.ID, &channel.CreatedAt, &channel.UpdatedAt)
 		if err != nil {
 			if isUniqueViolation(err) {
@@ -75,9 +75,9 @@ func (r *channelRepository) GetByID(ctx context.Context, id int64) (*service.Cha
 	ch := &service.Channel{}
 	var modelMappingJSON []byte
 	err := r.db.QueryRowContext(ctx,
-		`SELECT id, name, description, status, model_mapping, created_at, updated_at
+		`SELECT id, name, description, status, model_mapping, billing_model_source, restrict_models, created_at, updated_at
 		 FROM channels WHERE id = $1`, id,
-	).Scan(&ch.ID, &ch.Name, &ch.Description, &ch.Status, &modelMappingJSON, &ch.CreatedAt, &ch.UpdatedAt)
+	).Scan(&ch.ID, &ch.Name, &ch.Description, &ch.Status, &modelMappingJSON, &ch.BillingModelSource, &ch.RestrictModels, &ch.CreatedAt, &ch.UpdatedAt)
 	if err == sql.ErrNoRows {
 		return nil, service.ErrChannelNotFound
 	}
@@ -108,9 +108,9 @@ func (r *channelRepository) Update(ctx context.Context, channel *service.Channel
 			return err
 		}
 		result, err := tx.ExecContext(ctx,
-			`UPDATE channels SET name = $1, description = $2, status = $3, model_mapping = $4, updated_at = NOW()
+			`UPDATE channels SET name = $1, description = $2, status = $3, model_mapping = $4, billing_model_source = $5, restrict_models = $6, updated_at = NOW()
-			 WHERE id = $5`,
+			 WHERE id = $7`,
-			channel.Name, channel.Description, channel.Status, modelMappingJSON, channel.ID,
+			channel.Name, channel.Description, channel.Status, modelMappingJSON, channel.BillingModelSource, channel.RestrictModels, channel.ID,
 		)
 		if err != nil {
 			if isUniqueViolation(err) {
@@ -187,7 +187,7 @@ func (r *channelRepository) List(ctx context.Context, params pagination.Paginati
 
 	// 查询 channel 列表
 	dataQuery := fmt.Sprintf(
-		`SELECT c.id, c.name, c.description, c.status, c.model_mapping, c.created_at, c.updated_at
+		`SELECT c.id, c.name, c.description, c.status, c.model_mapping, c.billing_model_source, c.restrict_models, c.created_at, c.updated_at
 		 FROM channels c WHERE %s ORDER BY c.id DESC LIMIT $%d OFFSET $%d`,
 		whereClause, argIdx, argIdx+1,
 	)
@@ -204,7 +204,7 @@ func (r *channelRepository) List(ctx context.Context, params pagination.Paginati
 	for rows.Next() {
 		var ch service.Channel
 		var modelMappingJSON []byte
-		if err := rows.Scan(&ch.ID, &ch.Name, &ch.Description, &ch.Status, &modelMappingJSON, &ch.CreatedAt, &ch.UpdatedAt); err != nil {
+		if err := rows.Scan(&ch.ID, &ch.Name, &ch.Description, &ch.Status, &modelMappingJSON, &ch.BillingModelSource, &ch.RestrictModels, &ch.CreatedAt, &ch.UpdatedAt); err != nil {
 			return nil, nil, fmt.Errorf("scan channel: %w", err)
 		}
 		ch.ModelMapping = unmarshalModelMapping(modelMappingJSON)
@@ -248,7 +248,7 @@ func (r *channelRepository) List(ctx context.Context, params pagination.Paginati
 
 func (r *channelRepository) ListAll(ctx context.Context) ([]service.Channel, error) {
 	rows, err := r.db.QueryContext(ctx,
-		`SELECT id, name, description, status, model_mapping, created_at, updated_at FROM channels ORDER BY id`,
+		`SELECT id, name, description, status, model_mapping, billing_model_source, restrict_models, created_at, updated_at FROM channels ORDER BY id`,
 	)
 	if err != nil {
 		return nil, fmt.Errorf("query all channels: %w", err)
@@ -260,7 +260,7 @@ func (r *channelRepository) ListAll(ctx context.Context) ([]service.Channel, err
 	for rows.Next() {
 		var ch service.Channel
 		var modelMappingJSON []byte
-		if err := rows.Scan(&ch.ID, &ch.Name, &ch.Description, &ch.Status, &modelMappingJSON, &ch.CreatedAt, &ch.UpdatedAt); err != nil {
+		if err := rows.Scan(&ch.ID, &ch.Name, &ch.Description, &ch.Status, &modelMappingJSON, &ch.BillingModelSource, &ch.RestrictModels, &ch.CreatedAt, &ch.UpdatedAt); err != nil {
 			return nil, fmt.Errorf("scan channel: %w", err)
 		}
 		ch.ModelMapping = unmarshalModelMapping(modelMappingJSON)

backend/internal/repository/channel_repo_pricing.go

@@ -15,7 +15,7 @@ import (
 
 func (r *channelRepository) ListModelPricing(ctx context.Context, channelID int64) ([]service.ChannelModelPricing, error) {
 	rows, err := r.db.QueryContext(ctx,
-		`SELECT id, channel_id, models, billing_mode, input_price, output_price, cache_write_price, cache_read_price, image_output_price, created_at, updated_at
+		`SELECT id, channel_id, models, billing_mode, input_price, output_price, cache_write_price, cache_read_price, image_output_price, per_request_price, created_at, updated_at
 		 FROM channel_model_pricing WHERE channel_id = $1 ORDER BY id`, channelID,
 	)
 	if err != nil {
@@ -56,10 +56,10 @@ func (r *channelRepository) UpdateModelPricing(ctx context.Context, pricing *ser
 	}
 	result, err := r.db.ExecContext(ctx,
 		`UPDATE channel_model_pricing
-		 SET models = $1, billing_mode = $2, input_price = $3, output_price = $4, cache_write_price = $5, cache_read_price = $6, image_output_price = $7, updated_at = NOW()
+		 SET models = $1, billing_mode = $2, input_price = $3, output_price = $4, cache_write_price = $5, cache_read_price = $6, image_output_price = $7, per_request_price = $8, updated_at = NOW()
-		 WHERE id = $8`,
+		 WHERE id = $9`,
 		modelsJSON, billingMode, pricing.InputPrice, pricing.OutputPrice, pricing.CacheWritePrice, pricing.CacheReadPrice,
-		pricing.ImageOutputPrice, pricing.ID,
+		pricing.ImageOutputPrice, pricing.PerRequestPrice, pricing.ID,
 	)
 	if err != nil {
 		return fmt.Errorf("update model pricing: %w", err)
@@ -90,7 +90,7 @@ func (r *channelRepository) ReplaceModelPricing(ctx context.Context, channelID i
 // batchLoadModelPricing 批量加载多个渠道的模型定价（含区间）
 func (r *channelRepository) batchLoadModelPricing(ctx context.Context, channelIDs []int64) (map[int64][]service.ChannelModelPricing, error) {
 	rows, err := r.db.QueryContext(ctx,
-		`SELECT id, channel_id, models, billing_mode, input_price, output_price, cache_write_price, cache_read_price, image_output_price, created_at, updated_at
+		`SELECT id, channel_id, models, billing_mode, input_price, output_price, cache_write_price, cache_read_price, image_output_price, per_request_price, created_at, updated_at
 		 FROM channel_model_pricing WHERE channel_id = ANY($1) ORDER BY channel_id, id`,
 		pq.Array(channelIDs),
 	)
@@ -171,7 +171,7 @@ func scanModelPricingRows(rows *sql.Rows) ([]service.ChannelModelPricing, []int6
 		if err := rows.Scan(
 			&p.ID, &p.ChannelID, &modelsJSON, &p.BillingMode,
 			&p.InputPrice, &p.OutputPrice, &p.CacheWritePrice, &p.CacheReadPrice,
-			&p.ImageOutputPrice, &p.CreatedAt, &p.UpdatedAt,
+			&p.ImageOutputPrice, &p.PerRequestPrice, &p.CreatedAt, &p.UpdatedAt,
 		); err != nil {
 			return nil, nil, fmt.Errorf("scan model pricing: %w", err)
 		}
@@ -224,11 +224,11 @@ func createModelPricingExec(ctx context.Context, exec dbExec, pricing *service.C
 		billingMode = service.BillingModeToken
 	}
 	err = exec.QueryRowContext(ctx,
-		`INSERT INTO channel_model_pricing (channel_id, models, billing_mode, input_price, output_price, cache_write_price, cache_read_price, image_output_price)
+		`INSERT INTO channel_model_pricing (channel_id, models, billing_mode, input_price, output_price, cache_write_price, cache_read_price, image_output_price, per_request_price)
-		 VALUES ($1, $2, $3, $4, $5, $6, $7, $8) RETURNING id, created_at, updated_at`,
+		 VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) RETURNING id, created_at, updated_at`,
 		pricing.ChannelID, modelsJSON, billingMode,
 		pricing.InputPrice, pricing.OutputPrice, pricing.CacheWritePrice, pricing.CacheReadPrice,
-		pricing.ImageOutputPrice,
+		pricing.ImageOutputPrice, pricing.PerRequestPrice,
 	).Scan(&pricing.ID, &pricing.CreatedAt, &pricing.UpdatedAt)
 	if err != nil {
 		return fmt.Errorf("insert model pricing: %w", err)

backend/internal/repository/usage_log_repo.go

@@ -28,7 +28,7 @@ import (
 	gocache "github.com/patrickmn/go-cache"
 )
 
-const usageLogSelectColumns = "id, user_id, api_key_id, account_id, request_id, model, requested_model, upstream_model, group_id, subscription_id, input_tokens, output_tokens, cache_creation_tokens, cache_read_tokens, cache_creation_5m_tokens, cache_creation_1h_tokens, input_cost, output_cost, cache_creation_cost, cache_read_cost, total_cost, actual_cost, rate_multiplier, account_rate_multiplier, billing_type, request_type, stream, openai_ws_mode, duration_ms, first_token_ms, user_agent, ip_address, image_count, image_size, media_type, service_tier, reasoning_effort, inbound_endpoint, upstream_endpoint, cache_ttl_overridden, created_at"
+const usageLogSelectColumns = "id, user_id, api_key_id, account_id, request_id, model, requested_model, upstream_model, group_id, subscription_id, input_tokens, output_tokens, cache_creation_tokens, cache_read_tokens, cache_creation_5m_tokens, cache_creation_1h_tokens, input_cost, output_cost, cache_creation_cost, cache_read_cost, total_cost, actual_cost, rate_multiplier, account_rate_multiplier, billing_type, request_type, stream, openai_ws_mode, duration_ms, first_token_ms, user_agent, ip_address, image_count, image_size, media_type, service_tier, reasoning_effort, inbound_endpoint, upstream_endpoint, cache_ttl_overridden, channel_id, model_mapping_chain, billing_tier, created_at"
 
 // usageLogInsertArgTypes must stay in the same order as:
 //  1. prepareUsageLogInsert().args
@@ -77,6 +77,9 @@ var usageLogInsertArgTypes = [...]string{
 	"text",        // inbound_endpoint
 	"text",        // upstream_endpoint
 	"boolean",     // cache_ttl_overridden
+	"bigint",      // channel_id
+	"text",        // model_mapping_chain
+	"text",        // billing_tier
 	"timestamptz", // created_at
 }
 
@@ -350,6 +353,9 @@ func (r *usageLogRepository) createSingle(ctx context.Context, sqlq sqlExecutor,
 			inbound_endpoint,
 			upstream_endpoint,
 			cache_ttl_overridden,
+			channel_id,
+			model_mapping_chain,
+			billing_tier,
 			created_at
 		) VALUES (
 			$1, $2, $3, $4, $5, $6, $7,
@@ -357,7 +363,7 @@ func (r *usageLogRepository) createSingle(ctx context.Context, sqlq sqlExecutor,
 			$10, $11, $12, $13,
 			$14, $15,
 			$16, $17, $18, $19, $20, $21,
-			$22, $23, $24, $25, $26, $27, $28, $29, $30, $31, $32, $33, $34, $35, $36, $37, $38, $39, $40
+			$22, $23, $24, $25, $26, $27, $28, $29, $30, $31, $32, $33, $34, $35, $36, $37, $38, $39, $40, $41, $42, $43
 		)
 		ON CONFLICT (request_id, api_key_id) DO NOTHING
 		RETURNING id, created_at
@@ -782,10 +788,13 @@ func buildUsageLogBatchInsertQuery(keys []string, preparedByKey map[string]usage
 			inbound_endpoint,
 			upstream_endpoint,
 			cache_ttl_overridden,
+			channel_id,
+			model_mapping_chain,
+			billing_tier,
 			created_at
 		) AS (VALUES `)
 
-	args := make([]any, 0, len(keys)*39)
+	args := make([]any, 0, len(keys)*44)
 	argPos := 1
 	for idx, key := range keys {
 		if idx > 0 {
@@ -853,6 +862,9 @@ func buildUsageLogBatchInsertQuery(keys []string, preparedByKey map[string]usage
 				inbound_endpoint,
 				upstream_endpoint,
 				cache_ttl_overridden,
+				channel_id,
+				model_mapping_chain,
+				billing_tier,
 				created_at
 			)
 			SELECT
@@ -895,6 +907,9 @@ func buildUsageLogBatchInsertQuery(keys []string, preparedByKey map[string]usage
 				inbound_endpoint,
 				upstream_endpoint,
 				cache_ttl_overridden,
+				channel_id,
+				model_mapping_chain,
+				billing_tier,
 				created_at
 			FROM input
 			ON CONFLICT (request_id, api_key_id) DO NOTHING
@@ -977,10 +992,13 @@ func buildUsageLogBestEffortInsertQuery(preparedList []usageLogInsertPrepared) (
 			inbound_endpoint,
 			upstream_endpoint,
 			cache_ttl_overridden,
+			channel_id,
+			model_mapping_chain,
+			billing_tier,
 			created_at
 		) AS (VALUES `)
 
-	args := make([]any, 0, len(preparedList)*40)
+	args := make([]any, 0, len(preparedList)*43)
 	argPos := 1
 	for idx, prepared := range preparedList {
 		if idx > 0 {
@@ -1045,6 +1063,9 @@ func buildUsageLogBestEffortInsertQuery(preparedList []usageLogInsertPrepared) (
 			inbound_endpoint,
 			upstream_endpoint,
 			cache_ttl_overridden,
+			channel_id,
+			model_mapping_chain,
+			billing_tier,
 			created_at
 		)
 		SELECT
@@ -1087,6 +1108,9 @@ func buildUsageLogBestEffortInsertQuery(preparedList []usageLogInsertPrepared) (
 			inbound_endpoint,
 			upstream_endpoint,
 			cache_ttl_overridden,
+			channel_id,
+			model_mapping_chain,
+			billing_tier,
 			created_at
 		FROM input
 		ON CONFLICT (request_id, api_key_id) DO NOTHING
@@ -1137,6 +1161,9 @@ func execUsageLogInsertNoResult(ctx context.Context, sqlq sqlExecutor, prepared
 			inbound_endpoint,
 			upstream_endpoint,
 			cache_ttl_overridden,
+			channel_id,
+			model_mapping_chain,
+			billing_tier,
 			created_at
 		) VALUES (
 			$1, $2, $3, $4, $5, $6, $7,
@@ -1144,7 +1171,7 @@ func execUsageLogInsertNoResult(ctx context.Context, sqlq sqlExecutor, prepared
 			$10, $11, $12, $13,
 			$14, $15,
 			$16, $17, $18, $19, $20, $21,
-			$22, $23, $24, $25, $26, $27, $28, $29, $30, $31, $32, $33, $34, $35, $36, $37, $38, $39, $40
+			$22, $23, $24, $25, $26, $27, $28, $29, $30, $31, $32, $33, $34, $35, $36, $37, $38, $39, $40, $41, $42, $43
 		)
 		ON CONFLICT (request_id, api_key_id) DO NOTHING
 	`, prepared.args...)
@@ -1176,6 +1203,9 @@ func prepareUsageLogInsert(log *service.UsageLog) usageLogInsertPrepared {
 	reasoningEffort := nullString(log.ReasoningEffort)
 	inboundEndpoint := nullString(log.InboundEndpoint)
 	upstreamEndpoint := nullString(log.UpstreamEndpoint)
+	channelID := nullInt64(log.ChannelID)
+	modelMappingChain := nullString(log.ModelMappingChain)
+	billingTier := nullString(log.BillingTier)
 	requestedModel := strings.TrimSpace(log.RequestedModel)
 	if requestedModel == "" {
 		requestedModel = strings.TrimSpace(log.Model)
@@ -1232,6 +1262,9 @@ func prepareUsageLogInsert(log *service.UsageLog) usageLogInsertPrepared {
 			inboundEndpoint,
 			upstreamEndpoint,
 			log.CacheTTLOverridden,
+			channelID,
+			modelMappingChain,
+			billingTier,
 			createdAt,
 		},
 	}
@@ -3959,6 +3992,9 @@ func scanUsageLog(scanner interface{ Scan(...any) error }) (*service.UsageLog, e
 		inboundEndpoint       sql.NullString
 		upstreamEndpoint      sql.NullString
 		cacheTTLOverridden    bool
+		channelID             sql.NullInt64
+		modelMappingChain     sql.NullString
+		billingTier           sql.NullString
 		createdAt             time.Time
 	)
 
@@ -4003,6 +4039,9 @@ func scanUsageLog(scanner interface{ Scan(...any) error }) (*service.UsageLog, e
 		&inboundEndpoint,
 		&upstreamEndpoint,
 		&cacheTTLOverridden,
+		&channelID,
+		&modelMappingChain,
+		&billingTier,
 		&createdAt,
 	); err != nil {
 		return nil, err
@@ -4087,6 +4126,16 @@ func scanUsageLog(scanner interface{ Scan(...any) error }) (*service.UsageLog, e
 	if upstreamModel.Valid {
 		log.UpstreamModel = &upstreamModel.String
 	}
+	if channelID.Valid {
+		value := channelID.Int64
+		log.ChannelID = &value
+	}
+	if modelMappingChain.Valid {
+		log.ModelMappingChain = &modelMappingChain.String
+	}
+	if billingTier.Valid {
+		log.BillingTier = &billingTier.String
+	}
 
 	return log, nil
 }

backend/internal/service/channel.go

@@ -23,14 +23,21 @@ func (m BillingMode) IsValid() bool {
 	return false
 }
 
+const (
+	BillingModelSourceRequested = "requested"
+	BillingModelSourceUpstream  = "upstream"
+)
+
 // Channel 渠道实体
 type Channel struct {
-	ID          int64
+	ID                 int64
-	Name        string
+	Name               string
-	Description string
+	Description        string
-	Status      string
+	Status             string
-	CreatedAt   time.Time
+	BillingModelSource string // "requested" or "upstream"
-	UpdatedAt   time.Time
+	RestrictModels     bool   // 是否限制模型（仅允许定价列表中的模型）
+	CreatedAt          time.Time
+	UpdatedAt          time.Time
 
 	// 关联的分组 ID 列表
 	GroupIDs []int64
@@ -44,13 +51,14 @@ type Channel struct {
 type ChannelModelPricing struct {
 	ID               int64
 	ChannelID        int64
-	Models           []string          // 绑定的模型列表
+	Models           []string    // 绑定的模型列表
-	BillingMode      BillingMode       // 计费模式
+	BillingMode      BillingMode // 计费模式
-	InputPrice       *float64          // 每 token 输入价格（USD）— 向后兼容 flat 定价
+	InputPrice       *float64    // 每 token 输入价格（USD）— 向后兼容 flat 定价
-	OutputPrice      *float64          // 每 token 输出价格（USD）
+	OutputPrice      *float64    // 每 token 输出价格（USD）
-	CacheWritePrice  *float64          // 缓存写入价格
+	CacheWritePrice  *float64    // 缓存写入价格
-	CacheReadPrice   *float64          // 缓存读取价格
+	CacheReadPrice   *float64    // 缓存读取价格
-	ImageOutputPrice *float64          // 图片输出价格（向后兼容）
+	ImageOutputPrice *float64    // 图片输出价格（向后兼容）
+	PerRequestPrice  *float64    // 默认按次计费价格（USD）
 	Intervals        []PricingInterval // 区间定价列表
 	CreatedAt        time.Time
 	UpdatedAt        time.Time
@@ -106,12 +114,10 @@ func (c *Channel) IsActive() bool {
 }
 
 // GetModelPricing 根据模型名查找渠道定价，未找到返回 nil。
-// 优先精确匹配，然后通配符匹配（如 claude-opus-*）。大小写不敏感。
+// 精确匹配，大小写不敏感。返回值拷贝，不污染缓存。
-// 返回值拷贝，不污染缓存。
 func (c *Channel) GetModelPricing(model string) *ChannelModelPricing {
 	modelLower := strings.ToLower(model)
 
-	// 第一轮：精确匹配
 	for i := range c.ModelPricing {
 		for _, m := range c.ModelPricing[i].Models {
 			if strings.ToLower(m) == modelLower {
@@ -121,20 +127,6 @@ func (c *Channel) GetModelPricing(model string) *ChannelModelPricing {
 		}
 	}
 
-	// 第二轮：通配符匹配（仅支持末尾 *）
-	for i := range c.ModelPricing {
-		for _, m := range c.ModelPricing[i].Models {
-			mLower := strings.ToLower(m)
-			if strings.HasSuffix(mLower, "*") {
-				prefix := strings.TrimSuffix(mLower, "*")
-				if strings.HasPrefix(modelLower, prefix) {
-					cp := c.ModelPricing[i].Clone()
-					return &cp
-				}
-			}
-		}
-	}
-
 	return nil
 }
 

backend/internal/service/channel_service.go

@@ -47,13 +47,30 @@ type ChannelRepository interface {
 	ReplaceModelPricing(ctx context.Context, channelID int64, pricingList []ChannelModelPricing) error
 }
 
-// channelCache 渠道缓存快照
+// channelModelKey 渠道缓存复合键
+type channelModelKey struct {
+	groupID int64
+	model   string // lowercase
+}
+
+// channelCache 渠道缓存快照（扁平化哈希结构，热路径 O(1) 查找）
 type channelCache struct {
-	// byID: channelID -> *Channel（含 ModelPricing）
+	// 热路径查找
-	byID map[int64]*Channel
+	pricingByGroupModel map[channelModelKey]*ChannelModelPricing // (groupID, model) → 定价
-	// byGroupID: groupID -> channelID
+	mappingByGroupModel map[channelModelKey]string                // (groupID, model) → 映射目标
-	byGroupID map[int64]int64
+	channelByGroupID    map[int64]*Channel                        // groupID → 渠道
-	loadedAt  time.Time
+
+	// 冷路径（CRUD 操作）
+	byID     map[int64]*Channel
+	loadedAt time.Time
+}
+
+// ChannelMappingResult 渠道映射查找结果
+type ChannelMappingResult struct {
+	MappedModel        string // 映射后的模型名（无映射时等于原始模型名）
+	ChannelID          int64  // 渠道 ID（0 = 无渠道关联）
+	Mapped             bool   // 是否发生了映射
+	BillingModelSource string // 计费模型来源（"requested" / "upstream"）
 }
 
 const (
@@ -115,25 +132,46 @@ func (s *ChannelService) buildCache(ctx context.Context) (*channelCache, error)
 		// error-TTL：失败时存入短 TTL 空缓存，防止紧密重试
 		slog.Warn("failed to build channel cache", "error", err)
 		errorCache := &channelCache{
-			byID:      make(map[int64]*Channel),
+			pricingByGroupModel: make(map[channelModelKey]*ChannelModelPricing),
-			byGroupID: make(map[int64]int64),
+			mappingByGroupModel: make(map[channelModelKey]string),
-			loadedAt:  time.Now().Add(channelCacheTTL - channelErrorTTL), // 使剩余 TTL = errorTTL
+			channelByGroupID:    make(map[int64]*Channel),
+			byID:                make(map[int64]*Channel),
+			loadedAt:            time.Now().Add(channelCacheTTL - channelErrorTTL), // 使剩余 TTL = errorTTL
 		}
 		s.cache.Store(errorCache)
 		return nil, fmt.Errorf("list all channels: %w", err)
 	}
 
 	cache := &channelCache{
-		byID:      make(map[int64]*Channel, len(channels)),
+		pricingByGroupModel: make(map[channelModelKey]*ChannelModelPricing),
-		byGroupID: make(map[int64]int64),
+		mappingByGroupModel: make(map[channelModelKey]string),
-		loadedAt:  time.Now(),
+		channelByGroupID:    make(map[int64]*Channel),
+		byID:                make(map[int64]*Channel, len(channels)),
+		loadedAt:            time.Now(),
 	}
 
 	for i := range channels {
 		ch := &channels[i]
 		cache.byID[ch.ID] = ch
+
+		// 展开到分组维度
 		for _, gid := range ch.GroupIDs {
-			cache.byGroupID[gid] = ch.ID
+			cache.channelByGroupID[gid] = ch
+
+			// 展开模型定价到 (groupID, model) → *ChannelModelPricing
+			for j := range ch.ModelPricing {
+				pricing := &ch.ModelPricing[j]
+				for _, model := range pricing.Models {
+					key := channelModelKey{groupID: gid, model: strings.ToLower(model)}
+					cache.pricingByGroupModel[key] = pricing
+				}
+			}
+
+			// 展开模型映射到 (groupID, model) → target
+			for src, dst := range ch.ModelMapping {
+				key := channelModelKey{groupID: gid, model: strings.ToLower(src)}
+				cache.mappingByGroupModel[key] = dst
+			}
 		}
 	}
 
@@ -147,42 +185,94 @@ func (s *ChannelService) invalidateCache() {
 	s.cacheSF.Forget("channel_cache")
 }
 
-// GetChannelForGroup 获取分组关联的渠道（热路径，从缓存读取）
+// GetChannelForGroup 获取分组关联的渠道（热路径 O(1)）
-// 返回深拷贝，不污染缓存。
 func (s *ChannelService) GetChannelForGroup(ctx context.Context, groupID int64) (*Channel, error) {
 	cache, err := s.loadCache(ctx)
 	if err != nil {
 		return nil, err
 	}
 
-	channelID, ok := cache.byGroupID[groupID]
+	ch, ok := cache.channelByGroupID[groupID]
-	if !ok {
+	if !ok || !ch.IsActive() {
-		return nil, nil
-	}
-
-	ch, ok := cache.byID[channelID]
-	if !ok {
-		return nil, nil
-	}
-
-	if !ch.IsActive() {
 		return nil, nil
 	}
 
 	return ch.Clone(), nil
 }
 
-// GetChannelModelPricing 获取指定分组+模型的渠道定价（热路径）
+// GetChannelModelPricing 获取指定分组+模型的渠道定价（热路径 O(1)）
 func (s *ChannelService) GetChannelModelPricing(ctx context.Context, groupID int64, model string) *ChannelModelPricing {
-	ch, err := s.GetChannelForGroup(ctx, groupID)
+	cache, err := s.loadCache(ctx)
 	if err != nil {
-		slog.Warn("failed to get channel for group", "group_id", groupID, "error", err)
+		slog.Warn("failed to load channel cache", "group_id", groupID, "error", err)
 		return nil
 	}
-	if ch == nil {
+
+	// 检查渠道是否启用
+	ch, ok := cache.channelByGroupID[groupID]
+	if !ok || !ch.IsActive() {
 		return nil
 	}
-	return ch.GetModelPricing(model)
+
+	key := channelModelKey{groupID: groupID, model: strings.ToLower(model)}
+	pricing, ok := cache.pricingByGroupModel[key]
+	if !ok {
+		return nil
+	}
+
+	cp := pricing.Clone()
+	return &cp
+}
+
+// ResolveChannelMapping 解析渠道级模型映射（热路径 O(1)）
+// 返回映射结果，包含映射后的模型名、渠道 ID、计费模型来源。
+func (s *ChannelService) ResolveChannelMapping(ctx context.Context, groupID int64, model string) ChannelMappingResult {
+	cache, err := s.loadCache(ctx)
+	if err != nil {
+		return ChannelMappingResult{MappedModel: model}
+	}
+
+	ch, ok := cache.channelByGroupID[groupID]
+	if !ok || !ch.IsActive() {
+		return ChannelMappingResult{MappedModel: model}
+	}
+
+	result := ChannelMappingResult{
+		MappedModel:        model,
+		ChannelID:          ch.ID,
+		BillingModelSource: ch.BillingModelSource,
+	}
+	if result.BillingModelSource == "" {
+		result.BillingModelSource = BillingModelSourceRequested
+	}
+
+	key := channelModelKey{groupID: groupID, model: strings.ToLower(model)}
+	if mapped, ok := cache.mappingByGroupModel[key]; ok {
+		result.MappedModel = mapped
+		result.Mapped = true
+	}
+
+	return result
+}
+
+// IsModelRestricted 检查模型是否被渠道限制。
+// 返回 true 表示模型被限制（不在允许列表中）。
+// 如果渠道未启用模型限制或分组无渠道关联，返回 false。
+func (s *ChannelService) IsModelRestricted(ctx context.Context, groupID int64, model string) bool {
+	cache, err := s.loadCache(ctx)
+	if err != nil {
+		return false // 缓存加载失败时不限制
+	}
+
+	ch, ok := cache.channelByGroupID[groupID]
+	if !ok || !ch.IsActive() || !ch.RestrictModels {
+		return false
+	}
+
+	// 检查模型是否在定价列表中
+	key := channelModelKey{groupID: groupID, model: strings.ToLower(model)}
+	_, exists := cache.pricingByGroupModel[key]
+	return !exists
 }
 
 // --- CRUD ---
@@ -209,12 +299,17 @@ func (s *ChannelService) Create(ctx context.Context, input *CreateChannelInput)
 	}
 
 	channel := &Channel{
-		Name:         input.Name,
+		Name:               input.Name,
-		Description:  input.Description,
+		Description:        input.Description,
-		Status:       StatusActive,
+		Status:             StatusActive,
-		GroupIDs:     input.GroupIDs,
+		BillingModelSource: input.BillingModelSource,
-		ModelPricing: input.ModelPricing,
+		RestrictModels:     input.RestrictModels,
-		ModelMapping: input.ModelMapping,
+		GroupIDs:            input.GroupIDs,
+		ModelPricing:        input.ModelPricing,
+		ModelMapping:        input.ModelMapping,
+	}
+	if channel.BillingModelSource == "" {
+		channel.BillingModelSource = BillingModelSourceRequested
 	}
 
 	if err := validateNoDuplicateModels(channel.ModelPricing); err != nil {
@@ -260,6 +355,10 @@ func (s *ChannelService) Update(ctx context.Context, id int64, input *UpdateChan
 		channel.Status = input.Status
 	}
 
+	if input.RestrictModels != nil {
+		channel.RestrictModels = *input.RestrictModels
+	}
+
 	// 检查分组冲突
 	if input.GroupIDs != nil {
 		conflicting, err := s.repo.GetGroupsInOtherChannels(ctx, id, *input.GroupIDs)
@@ -280,6 +379,10 @@ func (s *ChannelService) Update(ctx context.Context, id int64, input *UpdateChan
 		channel.ModelMapping = input.ModelMapping
 	}
 
+	if input.BillingModelSource != "" {
+		channel.BillingModelSource = input.BillingModelSource
+	}
+
 	if err := validateNoDuplicateModels(channel.ModelPricing); err != nil {
 		return nil, err
 	}
@@ -351,19 +454,23 @@ func validateNoDuplicateModels(pricingList []ChannelModelPricing) error {
 
 // CreateChannelInput 创建渠道输入
 type CreateChannelInput struct {
-	Name         string
+	Name               string
-	Description  string
+	Description        string
-	GroupIDs     []int64
+	GroupIDs           []int64
-	ModelPricing []ChannelModelPricing
+	ModelPricing       []ChannelModelPricing
-	ModelMapping map[string]string
+	ModelMapping       map[string]string
+	BillingModelSource string
+	RestrictModels     bool
 }
 
 // UpdateChannelInput 更新渠道输入
 type UpdateChannelInput struct {
-	Name         string
+	Name               string
-	Description  *string
+	Description        *string
-	Status       string
+	Status             string
-	GroupIDs     *[]int64
+	GroupIDs           *[]int64
-	ModelPricing *[]ChannelModelPricing
+	ModelPricing       *[]ChannelModelPricing
-	ModelMapping map[string]string
+	ModelMapping       map[string]string
+	BillingModelSource string
+	RestrictModels     *bool
 }

backend/internal/service/channel_test.go

@@ -15,7 +15,6 @@ func TestGetModelPricing(t *testing.T) {
 	ch := &Channel{
 		ModelPricing: []ChannelModelPricing{
 			{ID: 1, Models: []string{"claude-sonnet-4"}, BillingMode: BillingModeToken, InputPrice: channelTestPtrFloat64(3e-6)},
-			{ID: 2, Models: []string{"claude-*"}, BillingMode: BillingModeToken, InputPrice: channelTestPtrFloat64(5e-6)},
 			{ID: 3, Models: []string{"gpt-5.1"}, BillingMode: BillingModePerRequest},
 		},
 	}
@@ -28,9 +27,8 @@ func TestGetModelPricing(t *testing.T) {
 	}{
 		{"exact match", "claude-sonnet-4", 1, false},
 		{"case insensitive", "Claude-Sonnet-4", 1, false},
-		{"wildcard match", "claude-opus-4-20250514", 2, false},
-		{"exact takes priority over wildcard", "claude-sonnet-4", 1, false},
 		{"not found", "gemini-3.1-pro", 0, true},
+		{"wildcard pattern not matched", "claude-opus-4-20250514", 0, true},
 		{"per_request model", "gpt-5.1", 3, false},
 	}
 

backend/internal/service/gateway_service.go

@@ -7413,6 +7413,12 @@ type RecordUsageInput struct {
 	RequestPayloadHash string             // 请求体语义哈希，用于降低 request_id 误复用时的静默误去重风险
 	ForceCacheBilling  bool               // 强制缓存计费：将 input_tokens 转为 cache_read 计费（用于粘性会话切换）
 	APIKeyService      APIKeyQuotaUpdater // 可选：用于更新API Key配额
+
+	// 渠道映射信息（由 handler 在 Forward 前解析）
+	ChannelID          int64  // 渠道 ID（0 = 无渠道）
+	OriginalModel      string // 用户原始请求模型（渠道映射前）
+	BillingModelSource string // 计费模型来源："requested" / "upstream"
+	ModelMappingChain  string // 映射链描述，如 "a→b→c"
 }
 
 // APIKeyQuotaUpdater defines the interface for updating API Key quota and rate limit usage
@@ -7732,7 +7738,17 @@ func (s *GatewayService) RecordUsage(ctx context.Context, input *RecordUsageInpu
 	}
 
 	var cost *CostBreakdown
+	// 确定计费模型
 	billingModel := forwardResultBillingModel(result.Model, result.UpstreamModel)
+	if input.BillingModelSource == BillingModelSourceRequested && input.OriginalModel != "" {
+		billingModel = input.OriginalModel
+	}
+
+	// 确定 RequestedModel（渠道映射前的原始模型）
+	requestedModel := result.Model
+	if input.OriginalModel != "" {
+		requestedModel = input.OriginalModel
+	}
 
 	// 根据请求类型选择计费方式
 	if result.MediaType == "image" || result.MediaType == "video" {
@@ -7815,7 +7831,7 @@ func (s *GatewayService) RecordUsage(ctx context.Context, input *RecordUsageInpu
 		AccountID:             account.ID,
 		RequestID:             requestID,
 		Model:                 result.Model,
-		RequestedModel:        result.Model,
+		RequestedModel:        requestedModel,
 		UpstreamModel:         optionalNonEqualStringPtr(result.UpstreamModel, result.Model),
 		ReasoningEffort:       result.ReasoningEffort,
 		InboundEndpoint:       optionalTrimmedStringPtr(input.InboundEndpoint),
@@ -7842,6 +7858,8 @@ func (s *GatewayService) RecordUsage(ctx context.Context, input *RecordUsageInpu
 		ImageSize:             imageSize,
 		MediaType:             mediaType,
 		CacheTTLOverridden:    cacheTTLOverridden,
+		ChannelID:             optionalInt64Ptr(input.ChannelID),
+		ModelMappingChain:     optionalTrimmedStringPtr(input.ModelMappingChain),
 		CreatedAt:             time.Now(),
 	}
 
@@ -7909,6 +7927,12 @@ type RecordUsageLongContextInput struct {
 	LongContextMultiplier float64            // 超出阈值部分的倍率（如 2.0）
 	ForceCacheBilling     bool               // 强制缓存计费：将 input_tokens 转为 cache_read 计费（用于粘性会话切换）
 	APIKeyService         APIKeyQuotaUpdater // API Key 配额服务（可选）
+
+	// 渠道映射信息（由 handler 在 Forward 前解析）
+	ChannelID          int64  // 渠道 ID（0 = 无渠道）
+	OriginalModel      string // 用户原始请求模型（渠道映射前）
+	BillingModelSource string // 计费模型来源："requested" / "upstream"
+	ModelMappingChain  string // 映射链描述，如 "a→b→c"
 }
 
 // RecordUsageWithLongContext 记录使用量并扣费，支持长上下文双倍计费（用于 Gemini）
@@ -7946,7 +7970,17 @@ func (s *GatewayService) RecordUsageWithLongContext(ctx context.Context, input *
 	}
 
 	var cost *CostBreakdown
+	// 确定计费模型
 	billingModel := forwardResultBillingModel(result.Model, result.UpstreamModel)
+	if input.BillingModelSource == BillingModelSourceRequested && input.OriginalModel != "" {
+		billingModel = input.OriginalModel
+	}
+
+	// 确定 RequestedModel（渠道映射前的原始模型）
+	requestedModel := result.Model
+	if input.OriginalModel != "" {
+		requestedModel = input.OriginalModel
+	}
 
 	// 根据请求类型选择计费方式
 	if result.ImageCount > 0 {
@@ -8008,7 +8042,7 @@ func (s *GatewayService) RecordUsageWithLongContext(ctx context.Context, input *
 		AccountID:             account.ID,
 		RequestID:             requestID,
 		Model:                 result.Model,
-		RequestedModel:        result.Model,
+		RequestedModel:        requestedModel,
 		UpstreamModel:         optionalNonEqualStringPtr(result.UpstreamModel, result.Model),
 		ReasoningEffort:       result.ReasoningEffort,
 		InboundEndpoint:       optionalTrimmedStringPtr(input.InboundEndpoint),
@@ -8034,6 +8068,8 @@ func (s *GatewayService) RecordUsageWithLongContext(ctx context.Context, input *
 		ImageCount:            result.ImageCount,
 		ImageSize:             imageSize,
 		CacheTTLOverridden:    cacheTTLOverridden,
+		ChannelID:             optionalInt64Ptr(input.ChannelID),
+		ModelMappingChain:     optionalTrimmedStringPtr(input.ModelMappingChain),
 		CreatedAt:             time.Now(),
 	}
 
@@ -8085,6 +8121,27 @@ func (s *GatewayService) RecordUsageWithLongContext(ctx context.Context, input *
 	return nil
 }
 
+// ResolveChannelMapping 委托渠道服务解析模型映射
+func (s *GatewayService) ResolveChannelMapping(ctx context.Context, groupID int64, model string) ChannelMappingResult {
+	if s.channelService == nil {
+		return ChannelMappingResult{MappedModel: model}
+	}
+	return s.channelService.ResolveChannelMapping(ctx, groupID, model)
+}
+
+// ReplaceModelInBody 替换请求体中的模型名（导出供 handler 使用）
+func (s *GatewayService) ReplaceModelInBody(body []byte, newModel string) []byte {
+	return s.replaceModelInBody(body, newModel)
+}
+
+// IsModelRestricted 检查模型是否被渠道限制
+func (s *GatewayService) IsModelRestricted(ctx context.Context, groupID int64, model string) bool {
+	if s.channelService == nil {
+		return false
+	}
+	return s.channelService.IsModelRestricted(ctx, groupID, model)
+}
+
 // ForwardCountTokens 转发 count_tokens 请求到上游 API
 // 特点：不记录使用量、仅支持非流式响应
 func (s *GatewayService) ForwardCountTokens(ctx context.Context, c *gin.Context, account *Account, parsed *ParsedRequest) error {

backend/internal/service/usage_log.go

@@ -104,6 +104,12 @@ type UsageLog struct {
 	// UpstreamModel is the actual model sent to the upstream provider after mapping.
 	// Nil means no mapping was applied (requested model was used as-is).
 	UpstreamModel *string
+	// ChannelID 渠道 ID
+	ChannelID *int64
+	// ModelMappingChain 模型映射链，如 "a→b→c"
+	ModelMappingChain *string
+	// BillingTier 计费层级标签（per_request/image 模式）
+	BillingTier *string
 	// ServiceTier records the OpenAI service tier used for billing, e.g. "priority" / "flex".
 	ServiceTier *string
 	// ReasoningEffort is the request's reasoning effort level.

backend/internal/service/usage_log_helpers.go

@@ -26,3 +26,10 @@ func forwardResultBillingModel(requestedModel, upstreamModel string) string {
 	}
 	return strings.TrimSpace(upstreamModel)
 }
+
+func optionalInt64Ptr(v int64) *int64 {
+	if v == 0 {
+		return nil
+	}
+	return &v
+}

backend/migrations/084_channel_billing_model_source.sql

@@ -0,0 +1,7 @@
+-- Add billing_model_source to channels (controls whether billing uses requested or upstream model)
+ALTER TABLE channels ADD COLUMN IF NOT EXISTS billing_model_source VARCHAR(20) DEFAULT 'requested';
+
+-- Add channel tracking fields to usage_logs
+ALTER TABLE usage_logs ADD COLUMN IF NOT EXISTS channel_id BIGINT;
+ALTER TABLE usage_logs ADD COLUMN IF NOT EXISTS model_mapping_chain VARCHAR(500);
+ALTER TABLE usage_logs ADD COLUMN IF NOT EXISTS billing_tier VARCHAR(50);

backend/migrations/085_channel_restrict_and_per_request_price.sql

@@ -0,0 +1,5 @@
+-- Add model restriction switch to channels
+ALTER TABLE channels ADD COLUMN IF NOT EXISTS restrict_models BOOLEAN DEFAULT false;
+
+-- Add default per_request_price to channel_model_pricing (fallback when no tier matches)
+ALTER TABLE channel_model_pricing ADD COLUMN IF NOT EXISTS per_request_price NUMERIC(20,10);

frontend/src/api/admin/channels.ts

@@ -29,6 +29,7 @@ export interface ChannelModelPricing {
   cache_write_price: number | null
   cache_read_price: number | null
   image_output_price: number | null
+  per_request_price: number | null
   intervals: PricingInterval[]
 }
 
@@ -37,8 +38,11 @@ export interface Channel {
   name: string
   description: string
   status: string
+  billing_model_source: string // "requested" | "upstream"
+  restrict_models: boolean
   group_ids: number[]
   model_pricing: ChannelModelPricing[]
+  model_mapping: Record<string, string>
   created_at: string
   updated_at: string
 }
@@ -48,6 +52,9 @@ export interface CreateChannelRequest {
   description?: string
   group_ids?: number[]
   model_pricing?: ChannelModelPricing[]
+  model_mapping?: Record<string, string>
+  billing_model_source?: string
+  restrict_models?: boolean
 }
 
 export interface UpdateChannelRequest {
@@ -56,6 +63,9 @@ export interface UpdateChannelRequest {
   status?: string
   group_ids?: number[]
   model_pricing?: ChannelModelPricing[]
+  model_mapping?: Record<string, string>
+  billing_model_source?: string
+  restrict_models?: boolean
 }
 
 interface PaginatedResponse<T> {

frontend/src/components/admin/channel/ModelTagInput.vue

@@ -29,7 +29,7 @@
       />
     </div>
     <p class="mt-1 text-xs text-gray-400">
-      {{ t('admin.channels.form.modelInputHint', 'Press Enter to add. Supports wildcard *.') }}
+      {{ t('admin.channels.form.modelInputHint', 'Press Enter to add, supports paste for batch import.') }}
     </p>
   </div>
 </template>

frontend/src/components/admin/channel/PricingEntryCard.vue

@@ -70,7 +70,7 @@
         <div class="mt-3 flex items-start gap-2">
           <div class="flex-1">
             <label class="text-xs font-medium text-gray-500 dark:text-gray-400">
-              {{ t('admin.channels.form.models', '模型列表') }}
+              {{ t('admin.channels.form.models', '模型列表') }} <span class="text-red-500">*</span>
             </label>
             <ModelTagInput
               :models="entry.models"
@@ -153,6 +153,17 @@
 
         <!-- Per-request mode -->
         <div v-else-if="entry.billing_mode === 'per_request'">
+          <!-- Default per-request price -->
+          <label class="mt-3 block text-xs font-medium text-gray-500 dark:text-gray-400">
+            {{ t('admin.channels.form.defaultPerRequestPrice', '默认单次价格（未命中层级时使用）') }}
+            <span class="ml-1 font-normal text-gray-400">$</span>
+          </label>
+          <div class="mt-1 w-48">
+            <input :value="entry.per_request_price" @input="emitField('per_request_price', ($event.target as HTMLInputElement).value)"
+              type="number" step="any" min="0" class="input text-sm" :placeholder="t('admin.channels.form.pricePlaceholder', '默认')" />
+          </div>
+
+          <!-- Tiers -->
           <div class="mt-3 flex items-center justify-between">
             <label class="text-xs font-medium text-gray-500 dark:text-gray-400">
               {{ t('admin.channels.form.requestTiers', '按次计费层级') }}
@@ -176,8 +187,19 @@
           </div>
         </div>
 
-        <!-- Image mode (legacy per-request) -->
+        <!-- Image mode -->
         <div v-else-if="entry.billing_mode === 'image'">
+          <!-- Default image price -->
+          <label class="mt-3 block text-xs font-medium text-gray-500 dark:text-gray-400">
+            {{ t('admin.channels.form.defaultImagePrice', '默认图片价格（未命中层级时使用）') }}
+            <span class="ml-1 font-normal text-gray-400">$</span>
+          </label>
+          <div class="mt-1 w-48">
+            <input :value="entry.image_output_price" @input="emitField('image_output_price', ($event.target as HTMLInputElement).value)"
+              type="number" step="any" min="0" class="input text-sm" :placeholder="t('admin.channels.form.pricePlaceholder', '默认')" />
+          </div>
+
+          <!-- Image tiers -->
           <div class="mt-3 flex items-center justify-between">
             <label class="text-xs font-medium text-gray-500 dark:text-gray-400">
               {{ t('admin.channels.form.imageTiers', '图片计费层级（按次）') }}
@@ -196,15 +218,6 @@
               @remove="removeInterval(idx)"
             />
           </div>
-          <div v-else>
-            <div class="mt-2 grid grid-cols-2 gap-2 sm:grid-cols-4">
-              <div>
-                <label class="text-xs text-gray-400">{{ t('admin.channels.form.imageOutputPrice', '图片输出价格') }}</label>
-                <input :value="entry.image_output_price" @input="emitField('image_output_price', ($event.target as HTMLInputElement).value)"
-                  type="number" step="any" min="0" class="input mt-0.5 text-sm" :placeholder="t('admin.channels.form.pricePlaceholder', '默认')" />
-              </div>
-            </div>
-          </div>
         </div>
       </div>
     </div>

frontend/src/components/admin/channel/types.ts

@@ -20,6 +20,7 @@ export interface PricingFormEntry {
   cache_write_price: number | string | null
   cache_read_price: number | string | null
   image_output_price: number | string | null
+  per_request_price: number | string | null
   intervals: IntervalFormEntry[]
 }
 

frontend/src/i18n/locales/en.ts

@@ -1770,8 +1770,8 @@ export default {
         inOtherChannel: 'In "{name}"',
         modelPricing: 'Model Pricing',
         models: 'Models',
-        modelsPlaceholder: 'Type model name and press Enter. Supports wildcard *',
+        modelsPlaceholder: 'Type full model name and press Enter',
-        modelInputHint: 'Press Enter to add. Supports paste and wildcard *.',
+        modelInputHint: 'Press Enter to add, supports paste for batch import.',
         billingMode: 'Billing Mode',
         defaultPrices: 'Default prices (fallback when no interval matches)',
         inputPrice: 'Input',
@@ -1790,7 +1790,23 @@ export default {
         noPricingRules: 'No pricing rules yet. Click "Add" to create one.',
         perRequestPrice: 'Price per Request',
         tierLabel: 'Tier',
-        resolution: 'Resolution'
+        resolution: 'Resolution',
+        modelMapping: 'Model Mapping',
+        modelMappingHint: 'Map request model names to actual model names. Runs before account-level mapping.',
+        noMappingRules: 'No mapping rules. Click "Add" to create one.',
+        mappingSource: 'Source model',
+        mappingTarget: 'Target model',
+        billingModelSource: 'Billing Model',
+        billingModelSourceRequested: 'Bill by requested model',
+        billingModelSourceUpstream: 'Bill by final upstream model',
+        billingModelSourceHint: 'Controls which model name is used for pricing lookup',
+        selectedCount: '{count} selected',
+        searchGroups: 'Search groups...',
+        noGroupsMatch: 'No groups match your search',
+        restrictModels: 'Restrict Models',
+        restrictModelsHint: 'When enabled, only models in the pricing list are allowed. Others will be rejected.',
+        defaultPerRequestPrice: 'Default per-request price (fallback when no tier matches)',
+        defaultImagePrice: 'Default image price (fallback when no tier matches)'
       }
     },
 

frontend/src/i18n/locales/zh.ts

@@ -1850,8 +1850,8 @@ export default {
         inOtherChannel: '已属于「{name}」',
         modelPricing: '模型定价',
         models: '模型列表',
-        modelsPlaceholder: '输入模型名后按回车添加，支持通配符 *',
+        modelsPlaceholder: '输入完整模型名后按回车添加',
-        modelInputHint: '按回车添加，支持粘贴批量导入，支持通配符 *',
+        modelInputHint: '按回车添加，支持粘贴批量导入',
         billingMode: '计费模式',
         defaultPrices: '默认价格（未命中区间时使用）',
         inputPrice: '输入',
@@ -1870,7 +1870,23 @@ export default {
         noPricingRules: '暂无定价规则，点击"添加"创建',
         perRequestPrice: '单次价格',
         tierLabel: '层级',
-        resolution: '分辨率'
+        resolution: '分辨率',
+        modelMapping: '模型映射',
+        modelMappingHint: '将请求中的模型名映射为实际模型名。在账号级别映射之前执行。',
+        noMappingRules: '暂无映射规则，点击"添加"创建',
+        mappingSource: '源模型',
+        mappingTarget: '目标模型',
+        billingModelSource: '计费模型',
+        billingModelSourceRequested: '以请求模型计费',
+        billingModelSourceUpstream: '以最终模型计费',
+        billingModelSourceHint: '控制使用哪个模型名称进行定价查找',
+        selectedCount: '已选 {count} 个',
+        searchGroups: '搜索分组...',
+        noGroupsMatch: '没有匹配的分组',
+        restrictModels: '限制模型',
+        restrictModelsHint: '开启后，仅允许模型定价列表中的模型。不在列表中的模型请求将被拒绝。',
+        defaultPerRequestPrice: '默认单次价格（未命中层级时使用）',
+        defaultImagePrice: '默认图片价格（未命中层级时使用）'
       }
     },
 

frontend/src/views/admin/ChannelsView.vue

@@ -146,7 +146,7 @@
       <form id="channel-form" @submit.prevent="handleSubmit" class="space-y-5">
         <!-- Name -->
         <div>
-          <label class="input-label">{{ t('admin.channels.form.name', 'Name') }}</label>
+          <label class="input-label">{{ t('admin.channels.form.name', 'Name') }} <span class="text-red-500">*</span></label>
           <input
             v-model="form.name"
             type="text"
@@ -173,9 +173,29 @@
           <Select v-model="form.status" :options="statusEditOptions" />
         </div>
 
+        <!-- Model Restriction -->
+        <div>
+          <label class="flex items-center gap-2 cursor-pointer">
+            <input
+              type="checkbox"
+              v-model="form.restrict_models"
+              class="h-4 w-4 rounded border-gray-300 text-primary-600 focus:ring-primary-500"
+            />
+            <span class="input-label mb-0">{{ t('admin.channels.form.restrictModels', 'Restrict Models') }}</span>
+          </label>
+          <p class="mt-1 ml-6 text-xs text-gray-400">
+            {{ t('admin.channels.form.restrictModelsHint', 'When enabled, only models in the pricing list are allowed. Others will be rejected.') }}
+          </p>
+        </div>
+
         <!-- Group Association -->
         <div>
-          <label class="input-label">{{ t('admin.channels.form.groups', 'Associated Groups') }}</label>
+          <label class="input-label">
+            {{ t('admin.channels.form.groups', 'Associated Groups') }}
+            <span v-if="selectedGroupCount > 0" class="ml-1 text-xs font-normal text-gray-400">
+              ({{ t('admin.channels.form.selectedCount', { count: selectedGroupCount }, `已选 ${selectedGroupCount} 个`) }})
+            </span>
+          </label>
           <div class="relative mb-2">
             <Icon
               name="search"
@@ -190,7 +210,7 @@
             />
           </div>
           <div
-            class="max-h-48 overflow-auto rounded-lg border border-gray-200 bg-white p-2 dark:border-dark-600 dark:bg-dark-800"
+            class="max-h-64 overflow-auto rounded-lg border border-gray-200 bg-white p-2 dark:border-dark-600 dark:bg-dark-800"
           >
             <div v-if="groupsLoading" class="py-4 text-center text-sm text-gray-500">
               {{ t('common.loading', 'Loading...') }}
@@ -198,38 +218,61 @@
             <div v-else-if="allGroups.length === 0" class="py-4 text-center text-sm text-gray-500">
               {{ t('admin.channels.form.noGroupsAvailable', 'No groups available') }}
             </div>
-            <div v-else-if="filteredGroups.length === 0" class="py-4 text-center text-sm text-gray-500">
+            <div v-else-if="groupsByPlatform.length === 0" class="py-4 text-center text-sm text-gray-500">
               {{ t('admin.channels.form.noGroupsMatch', 'No groups match your search') }}
             </div>
-            <label
+            <template v-else>
-              v-for="group in filteredGroups"
+              <div
-              :key="group.id"
+                v-for="section in groupsByPlatform"
-              class="flex cursor-pointer items-center gap-2 rounded px-2 py-1.5 hover:bg-gray-50 dark:hover:bg-dark-700"
+                :key="section.platform"
-              :class="{ 'opacity-50': isGroupInOtherChannel(group.id) }"
+                class="mb-2 last:mb-0"
-            >
-              <input
-                type="checkbox"
-                :checked="form.group_ids.includes(group.id)"
-                :disabled="isGroupInOtherChannel(group.id)"
-                class="h-4 w-4 rounded border-gray-300 text-primary-600 focus:ring-primary-500"
-                @change="toggleGroup(group.id)"
-              />
-              <PlatformIcon :platform="group.platform" size="xs" />
-              <span class="text-sm text-gray-700 dark:text-gray-300">{{ group.name }}</span>
-              <span
-                v-if="isGroupInOtherChannel(group.id)"
-                class="ml-auto text-xs text-gray-400"
               >
-                {{ getGroupInOtherChannelLabel(group.id) }}
+                <!-- Platform header -->
-              </span>
+                <div class="flex items-center gap-1.5 px-2 py-1">
-            </label>
+                  <PlatformIcon :platform="section.platform" size="sm" :class="getPlatformTextColor(section.platform)" />
+                  <span :class="['text-xs font-semibold', getPlatformTextColor(section.platform)]">
+                    {{ t('admin.groups.platforms.' + section.platform, section.platform) }}
+                  </span>
+                </div>
+                <!-- Groups under this platform -->
+                <label
+                  v-for="group in section.groups"
+                  :key="group.id"
+                  class="flex cursor-pointer items-center gap-2 rounded px-2 py-1.5 pl-7 hover:bg-gray-50 dark:hover:bg-dark-700"
+                  :class="{ 'opacity-50': isGroupInOtherChannel(group.id) }"
+                >
+                  <input
+                    type="checkbox"
+                    :checked="form.group_ids.includes(group.id)"
+                    :disabled="isGroupInOtherChannel(group.id)"
+                    class="h-4 w-4 rounded border-gray-300 text-primary-600 focus:ring-primary-500"
+                    @change="toggleGroup(group.id)"
+                  />
+                  <span class="text-sm text-gray-700 dark:text-gray-300">{{ group.name }}</span>
+                  <span
+                    :class="['ml-auto rounded-full px-1.5 py-0.5 text-[10px] font-medium', getRateBadgeClass(group.platform)]"
+                  >
+                    {{ group.rate_multiplier }}x
+                  </span>
+                  <span class="text-xs text-gray-400">
+                    {{ group.account_count || 0 }}
+                  </span>
+                  <span
+                    v-if="isGroupInOtherChannel(group.id)"
+                    class="text-xs text-gray-400"
+                  >
+                    {{ getGroupInOtherChannelLabel(group.id) }}
+                  </span>
+                </label>
+              </div>
+            </template>
           </div>
         </div>
 
         <!-- Model Pricing -->
         <div>
           <div class="mb-2 flex items-center justify-between">
-            <label class="input-label mb-0">{{ t('admin.channels.form.modelPricing', 'Model Pricing') }}</label>
+            <label class="input-label mb-0">{{ t('admin.channels.form.modelPricing', 'Model Pricing') }} <span class="text-red-500">*</span></label>
             <button type="button" @click="addPricingEntry" class="btn btn-secondary btn-sm">
               <Icon name="plus" size="sm" class="mr-1" />
               {{ t('common.add', 'Add') }}
@@ -253,6 +296,65 @@
             />
           </div>
         </div>
+
+        <!-- Billing Model Source -->
+        <div>
+          <label class="input-label">{{ t('admin.channels.form.billingModelSource', 'Billing Model') }}</label>
+          <Select v-model="form.billing_model_source" :options="billingModelSourceOptions" />
+          <p class="mt-1 text-xs text-gray-400">
+            {{ t('admin.channels.form.billingModelSourceHint', 'Controls which model name is used for pricing lookup') }}
+          </p>
+        </div>
+
+        <!-- Model Mapping -->
+        <div>
+          <div class="mb-2 flex items-center justify-between">
+            <label class="input-label mb-0">{{ t('admin.channels.form.modelMapping', 'Model Mapping') }}</label>
+            <button type="button" @click="addMappingEntry" class="btn btn-secondary btn-sm">
+              <Icon name="plus" size="sm" class="mr-1" />
+              {{ t('common.add', 'Add') }}
+            </button>
+          </div>
+          <p class="mb-2 text-xs text-gray-400">
+            {{ t('admin.channels.form.modelMappingHint', 'Map request model names to actual model names. Runs before account-level mapping.') }}
+          </p>
+          <div
+            v-if="Object.keys(form.model_mapping).length === 0"
+            class="rounded-lg border border-dashed border-gray-300 p-4 text-center text-sm text-gray-500 dark:border-dark-500 dark:text-gray-400"
+          >
+            {{ t('admin.channels.form.noMappingRules', 'No mapping rules. Click "Add" to create one.') }}
+          </div>
+          <div v-else class="space-y-2">
+            <div
+              v-for="(_, srcModel) in form.model_mapping"
+              :key="srcModel"
+              class="flex items-center gap-2"
+            >
+              <input
+                :value="srcModel"
+                type="text"
+                class="input flex-1 text-sm"
+                :placeholder="t('admin.channels.form.mappingSource', 'Source model')"
+                @change="renameMappingKey(srcModel, ($event.target as HTMLInputElement).value)"
+              />
+              <span class="text-gray-400">→</span>
+              <input
+                :value="form.model_mapping[srcModel]"
+                type="text"
+                class="input flex-1 text-sm"
+                :placeholder="t('admin.channels.form.mappingTarget', 'Target model')"
+                @input="form.model_mapping[srcModel] = ($event.target as HTMLInputElement).value"
+              />
+              <button
+                type="button"
+                @click="removeMappingEntry(srcModel)"
+                class="rounded p-1 text-gray-400 hover:text-red-500"
+              >
+                <Icon name="trash" size="sm" />
+              </button>
+            </div>
+          </div>
+        </div>
       </form>
 
       <template #footer>
@@ -299,7 +401,7 @@ import { adminAPI } from '@/api/admin'
 import type { Channel, ChannelModelPricing, CreateChannelRequest, UpdateChannelRequest } from '@/api/admin/channels'
 import type { PricingFormEntry } from '@/components/admin/channel/types'
 import { mTokToPerToken, perTokenToMTok, apiIntervalsToForm, formIntervalsToAPI } from '@/components/admin/channel/types'
-import type { AdminGroup } from '@/types'
+import type { AdminGroup, GroupPlatform } from '@/types'
 import type { Column } from '@/components/common/types'
 import AppLayout from '@/components/layout/AppLayout.vue'
 import TablePageLayout from '@/components/layout/TablePageLayout.vue'
@@ -339,6 +441,11 @@ const statusEditOptions = computed(() => [
   { value: 'disabled', label: t('admin.channels.statusDisabled', 'Disabled') }
 ])
 
+const billingModelSourceOptions = computed(() => [
+  { value: 'requested', label: t('admin.channels.form.billingModelSourceRequested', 'Bill by requested model') },
+  { value: 'upstream', label: t('admin.channels.form.billingModelSourceUpstream', 'Bill by final upstream model') }
+])
+
 // ── State ──
 const channels = ref<Channel[]>([])
 const loading = ref(false)
@@ -367,8 +474,11 @@ const form = reactive({
   name: '',
   description: '',
   status: 'active',
+  restrict_models: false,
   group_ids: [] as number[],
-  model_pricing: [] as PricingFormEntry[]
+  model_pricing: [] as PricingFormEntry[],
+  model_mapping: {} as Record<string, string>,
+  billing_model_source: 'requested' as string
 })
 
 let abortController: AbortController | null = null
@@ -380,12 +490,64 @@ function formatDate(value: string): string {
 }
 
 // ── Group helpers ──
-const filteredGroups = computed(() => {
+// Platform color helpers
+const platformOrder: GroupPlatform[] = ['anthropic', 'openai', 'gemini', 'antigravity', 'sora']
+
+function getPlatformTextColor(platform: string): string {
+  switch (platform) {
+    case 'anthropic': return 'text-orange-600 dark:text-orange-400'
+    case 'openai': return 'text-emerald-600 dark:text-emerald-400'
+    case 'gemini': return 'text-blue-600 dark:text-blue-400'
+    case 'antigravity': return 'text-purple-600 dark:text-purple-400'
+    case 'sora': return 'text-rose-600 dark:text-rose-400'
+    default: return 'text-gray-600 dark:text-gray-400'
+  }
+}
+
+function getRateBadgeClass(platform: string): string {
+  switch (platform) {
+    case 'anthropic': return 'bg-orange-100 text-orange-700 dark:bg-orange-900/30 dark:text-orange-400'
+    case 'openai': return 'bg-emerald-100 text-emerald-700 dark:bg-emerald-900/30 dark:text-emerald-400'
+    case 'gemini': return 'bg-blue-100 text-blue-700 dark:bg-blue-900/30 dark:text-blue-400'
+    case 'antigravity': return 'bg-purple-100 text-purple-700 dark:bg-purple-900/30 dark:text-purple-400'
+    case 'sora': return 'bg-rose-100 text-rose-700 dark:bg-rose-900/30 dark:text-rose-400'
+    default: return 'bg-gray-100 text-gray-700 dark:bg-gray-900/30 dark:text-gray-400'
+  }
+}
+
+const groupsByPlatform = computed(() => {
   const query = groupSearchQuery.value.trim().toLowerCase()
-  if (!query) return allGroups.value
+  const groups = query
-  return allGroups.value.filter(g => g.name.toLowerCase().includes(query))
+    ? allGroups.value.filter(g => g.name.toLowerCase().includes(query))
+    : allGroups.value
+
+  const grouped = new Map<GroupPlatform, typeof groups>()
+  for (const g of groups) {
+    const platform = g.platform
+    if (!platform) continue
+    if (!grouped.has(platform)) grouped.set(platform, [])
+    grouped.get(platform)!.push(g)
+  }
+
+  // Sort by platformOrder
+  const result: Array<{ platform: GroupPlatform; groups: typeof groups }> = []
+  for (const p of platformOrder) {
+    const list = grouped.get(p)
+    if (list && list.length > 0) {
+      result.push({ platform: p, groups: list })
+    }
+  }
+  // Add any remaining platforms not in platformOrder
+  for (const [p, list] of grouped) {
+    if (!platformOrder.includes(p) && list.length > 0) {
+      result.push({ platform: p, groups: list })
+    }
+  }
+  return result
 })
 
+const selectedGroupCount = computed(() => form.group_ids.length)
+
 const groupToChannelMap = computed(() => {
   const map = new Map<number, Channel>()
   for (const ch of channels.value) {
@@ -438,6 +600,7 @@ function addPricingEntry() {
     cache_write_price: null,
     cache_read_price: null,
     image_output_price: null,
+    per_request_price: null,
     intervals: []
   })
 }
@@ -461,6 +624,7 @@ function formPricingToAPI(): ChannelModelPricing[] {
       cache_write_price: mTokToPerToken(e.cache_write_price),
       cache_read_price: mTokToPerToken(e.cache_read_price),
       image_output_price: mTokToPerToken(e.image_output_price),
+      per_request_price: e.per_request_price != null && e.per_request_price !== '' ? Number(e.per_request_price) : null,
       intervals: formIntervalsToAPI(e.intervals || [])
     }))
 }
@@ -474,10 +638,36 @@ function apiPricingToForm(pricing: ChannelModelPricing[]): PricingFormEntry[] {
     cache_write_price: perTokenToMTok(p.cache_write_price),
     cache_read_price: perTokenToMTok(p.cache_read_price),
     image_output_price: perTokenToMTok(p.image_output_price),
+    per_request_price: p.per_request_price,
     intervals: apiIntervalsToForm(p.intervals || [])
   }))
 }
 
+// ── Model Mapping helpers ──
+function addMappingEntry() {
+  // Find a unique key
+  let key = ''
+  let i = 1
+  while (key === '' || key in form.model_mapping) {
+    key = `model-${i}`
+    i++
+  }
+  form.model_mapping[key] = ''
+}
+
+function removeMappingEntry(key: string) {
+  delete form.model_mapping[key]
+}
+
+function renameMappingKey(oldKey: string, newKey: string) {
+  newKey = newKey.trim()
+  if (!newKey || newKey === oldKey) return
+  if (newKey in form.model_mapping) return // prevent duplicate keys
+  const value = form.model_mapping[oldKey]
+  delete form.model_mapping[oldKey]
+  form.model_mapping[newKey] = value
+}
+
 // ── Load data ──
 async function loadChannels() {
   if (abortController) abortController.abort()
@@ -542,8 +732,11 @@ function resetForm() {
   form.name = ''
   form.description = ''
   form.status = 'active'
+  form.restrict_models = false
   form.group_ids = []
   form.model_pricing = []
+  form.model_mapping = {}
+  form.billing_model_source = 'requested'
   groupSearchQuery.value = ''
 }
 
@@ -559,8 +752,11 @@ function openEditDialog(channel: Channel) {
   form.name = channel.name
   form.description = channel.description || ''
   form.status = channel.status
+  form.restrict_models = channel.restrict_models || false
   form.group_ids = [...(channel.group_ids || [])]
   form.model_pricing = apiPricingToForm(channel.model_pricing || [])
+  form.model_mapping = { ...(channel.model_mapping || {}) }
+  form.billing_model_source = channel.billing_model_source || 'requested'
   loadGroups()
   showDialog.value = true
 }
@@ -594,7 +790,10 @@ async function handleSubmit() {
         description: form.description.trim() || undefined,
         status: form.status,
         group_ids: form.group_ids,
-        model_pricing: formPricingToAPI()
+        model_pricing: formPricingToAPI(),
+        model_mapping: Object.keys(form.model_mapping).length > 0 ? form.model_mapping : undefined,
+        billing_model_source: form.billing_model_source,
+        restrict_models: form.restrict_models
       }
       await adminAPI.channels.update(editingChannel.value.id, req)
       appStore.showSuccess(t('admin.channels.updateSuccess', 'Channel updated'))
@@ -603,7 +802,10 @@ async function handleSubmit() {
         name: form.name.trim(),
         description: form.description.trim() || undefined,
         group_ids: form.group_ids,
-        model_pricing: formPricingToAPI()
+        model_pricing: formPricingToAPI(),
+        model_mapping: Object.keys(form.model_mapping).length > 0 ? form.model_mapping : undefined,
+        billing_model_source: form.billing_model_source,
+        restrict_models: form.restrict_models
       }
       await adminAPI.channels.create(req)
       appStore.showSuccess(t('admin.channels.createSuccess', 'Channel created'))