feat(models): 统一模型规格价格与路由
This commit is contained in:
1 parent
d268a938e5
commit
236b850177
36 files changed
+3404
-421
No files matched your search
@@ -4,6 +4,7 @@ import (
|
||||
"crypto/rand"
|
||||
"encoding/hex"
|
||||
"errors"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
@@ -73,7 +74,14 @@ func (r *Repository) ChannelModels(channelID string, includeDisabled bool) ([]mo
|
||||
if !includeDisabled {
|
||||
query = query.Where("enabled = ?", true)
|
||||
}
|
||||
return items, query.Find(&items).Error
|
||||
if err := query.Find(&items).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
pointers := make([]*model.ChannelModel, len(items))
|
||||
for index := range items {
|
||||
pointers[index] = &items[index]
|
||||
}
|
||||
return items, r.attachChannelModelPriceTiers(pointers)
|
||||
}
|
||||
|
||||
func (r *Repository) ChannelModelByID(channelID string, id string) (*model.ChannelModel, error) {
|
||||
@@ -81,6 +89,9 @@ func (r *Repository) ChannelModelByID(channelID string, id string) (*model.Chann
|
||||
if err := r.db.First(&item, "id = ? AND channel_id = ?", id, channelID).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := r.attachChannelModelPriceTiers([]*model.ChannelModel{&item}); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &item, nil
|
||||
}
|
||||
|
||||
@@ -89,6 +100,9 @@ func (r *Repository) ChannelModelByKey(channelID string, modelKey string) (*mode
|
||||
if err := r.db.First(&item, "channel_id = ? AND model_key = ? AND enabled = ?", channelID, modelKey, true).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := r.attachChannelModelPriceTiers([]*model.ChannelModel{&item}); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &item, nil
|
||||
}
|
||||
|
||||
@@ -97,6 +111,9 @@ func (r *Repository) ChannelModelByKeyIncludingDisabled(channelID string, modelK
|
||||
if err := r.db.First(&item, "channel_id = ? AND model_key = ?", channelID, modelKey).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := r.attachChannelModelPriceTiers([]*model.ChannelModel{&item}); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &item, nil
|
||||
}
|
||||
|
||||
@@ -104,6 +121,104 @@ func (r *Repository) SaveChannelModel(item *model.ChannelModel) error {
|
||||
return r.db.Save(item).Error
|
||||
}
|
||||
|
||||
// SaveChannelModelWithPriceTiers 原子保存系统模型与其活动价格档。移除价格档采用软删除,
|
||||
// 让已结算订单的 PriceTierID 仍能回溯到原始配置版本。
|
||||
func (r *Repository) SaveChannelModelWithPriceTiers(item *model.ChannelModel, tiers []model.ChannelModelPriceTier) error {
|
||||
return r.db.Transaction(func(tx *gorm.DB) error {
|
||||
var existing []model.ChannelModelPriceTier
|
||||
if err := tx.Where("channel_model_id = ?", item.ID).Find(&existing).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
existingByKey := make(map[string]model.ChannelModelPriceTier, len(existing))
|
||||
for _, tier := range existing {
|
||||
existingByKey[channelModelPriceTierKey(tier)] = tier
|
||||
}
|
||||
selected := make(map[string]bool, len(tiers))
|
||||
for index := range tiers {
|
||||
tier := &tiers[index]
|
||||
tier.ChannelModelID = item.ID
|
||||
key := channelModelPriceTierKey(*tier)
|
||||
if existingTier, exists := existingByKey[key]; exists {
|
||||
tier.ID = existingTier.ID
|
||||
tier.PriceVersion = existingTier.PriceVersion + 1
|
||||
if err := tx.Save(tier).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
} else if err := tx.Create(tier).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
selected[tier.ID] = true
|
||||
}
|
||||
for _, tier := range existing {
|
||||
if selected[tier.ID] {
|
||||
continue
|
||||
}
|
||||
if err := tx.Delete(&tier).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if err := tx.Save(item).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
func channelModelPriceTierKey(tier model.ChannelModelPriceTier) string {
|
||||
if strings.TrimSpace(tier.SelectorKey) != "" {
|
||||
return tier.SelectorKey
|
||||
}
|
||||
_, key, err := model.CanonicalSKUSelector(map[string]string{
|
||||
"vquality": strings.TrimSpace(tier.Resolution),
|
||||
"videoSeconds": strconv.Itoa(tier.VideoSeconds),
|
||||
})
|
||||
if err != nil {
|
||||
return "{}"
|
||||
}
|
||||
return key
|
||||
}
|
||||
|
||||
func (r *Repository) attachChannelModelPriceTiers(items []*model.ChannelModel) error {
|
||||
if len(items) == 0 {
|
||||
return nil
|
||||
}
|
||||
ids := make([]string, 0, len(items))
|
||||
for _, item := range items {
|
||||
ids = append(ids, item.ID)
|
||||
}
|
||||
var tiers []model.ChannelModelPriceTier
|
||||
if err := r.db.Where("channel_model_id IN ?", ids).Order("selector_key asc, created_at asc").Find(&tiers).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
for index := range tiers {
|
||||
tiers[index].Selector = model.DecodeSKUSelector(tiers[index].SelectorJSON)
|
||||
}
|
||||
tiersByModelID := make(map[string][]model.ChannelModelPriceTier, len(items))
|
||||
for _, tier := range tiers {
|
||||
tiersByModelID[tier.ChannelModelID] = append(tiersByModelID[tier.ChannelModelID], tier)
|
||||
}
|
||||
for _, item := range items {
|
||||
item.PriceTiers = tiersByModelID[item.ID]
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// PopulateChannelModelPriceTiers 将价格档附着到已经查询出的渠道模型,供路由关系图批量加载使用。
|
||||
func (r *Repository) PopulateChannelModelPriceTiers(items []model.ChannelModel) error {
|
||||
pointers := make([]*model.ChannelModel, len(items))
|
||||
for index := range items {
|
||||
pointers[index] = &items[index]
|
||||
}
|
||||
return r.attachChannelModelPriceTiers(pointers)
|
||||
}
|
||||
|
||||
func (r *Repository) PopulateChannelModelPriceTier(item *model.ChannelModel) error {
|
||||
if item == nil {
|
||||
return nil
|
||||
}
|
||||
return r.attachChannelModelPriceTiers([]*model.ChannelModel{item})
|
||||
}
|
||||
|
||||
func (r *Repository) DeleteChannelModel(channelID string, id string, modelsJSON string, now time.Time) error {
|
||||
return r.db.Transaction(func(tx *gorm.DB) error {
|
||||
var activeReferences int64
|
||||
|
||||
@@ -37,6 +37,22 @@ func (r *Repository) LogicalModel(id string) (*model.LogicalModel, error) {
|
||||
return &item, nil
|
||||
}
|
||||
|
||||
func (r *Repository) LogicalModelsBySourceChannelModelID(channelModelID string) ([]model.LogicalModel, error) {
|
||||
var items []model.LogicalModel
|
||||
return items, r.db.Where("source_channel_model_id = ? AND archived_at IS NULL", channelModelID).Order("sort_order asc, created_at asc").Find(&items).Error
|
||||
}
|
||||
|
||||
func (r *Repository) LogicalModelsByOnlyActiveChannelModelID(channelModelID string) ([]model.LogicalModel, error) {
|
||||
var items []model.LogicalModel
|
||||
query := r.db.Model(&model.LogicalModel{}).
|
||||
Joins("JOIN logical_model_routes AS route ON route.logical_model_revision_id = logical_models.active_revision_id").
|
||||
Where("logical_models.archived_at IS NULL").
|
||||
Group("logical_models.id").
|
||||
Having("COUNT(route.id) = 1 AND MAX(route.channel_model_id) = ?", channelModelID).
|
||||
Order("logical_models.sort_order asc, logical_models.created_at asc")
|
||||
return items, query.Find(&items).Error
|
||||
}
|
||||
|
||||
func (r *Repository) LogicalModelRevision(id string) (*model.LogicalModelRevision, error) {
|
||||
var item model.LogicalModelRevision
|
||||
if err := r.db.First(&item, "id = ?", id).Error; err != nil {
|
||||
@@ -72,7 +88,10 @@ func (r *Repository) ChannelModelsByIDs(ids []string) ([]model.ChannelModel, err
|
||||
if len(ids) == 0 {
|
||||
return items, nil
|
||||
}
|
||||
return items, r.db.Where("id IN ?", ids).Find(&items).Error
|
||||
if err := r.db.Where("id IN ?", ids).Find(&items).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return items, r.PopulateChannelModelPriceTiers(items)
|
||||
}
|
||||
|
||||
func (r *Repository) SystemChannelsByIDs(ids []string, includeDisabled bool) ([]model.ModelChannel, error) {
|
||||
@@ -92,6 +111,9 @@ func (r *Repository) ChannelModel(id string) (*model.ChannelModel, error) {
|
||||
if err := r.db.First(&item, "id = ?", id).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := r.PopulateChannelModelPriceTier(&item); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &item, nil
|
||||
}
|
||||
|
||||
@@ -316,6 +338,8 @@ func (r *Repository) SwitchTaskLogicalRoute(taskID string, expectedRouteID strin
|
||||
}
|
||||
updates["billing_mode"] = replacement.BillingMode
|
||||
updates["price_version"] = replacement.PriceVersion
|
||||
updates["price_tier_id"] = replacement.PriceTierID
|
||||
updates["price_tier_version"] = replacement.PriceTierVersion
|
||||
updates["unit_price_microcredits"] = replacement.UnitPriceMicrocredits
|
||||
updates["multiplier_basis_points"] = replacement.MultiplierBasisPoints
|
||||
updates["quantity"] = replacement.Quantity
|
||||
@@ -353,12 +377,14 @@ func (r *Repository) SaveLogicalModelBundle(item *model.LogicalModel, revision *
|
||||
"capability": item.Capability,
|
||||
"enabled": item.Enabled,
|
||||
"sort_order": item.SortOrder,
|
||||
"source_channel_model_id": item.SourceChannelModelID,
|
||||
"price_policy": item.PricePolicy,
|
||||
"billing_mode": item.BillingMode,
|
||||
"unit_price_microcredits": item.UnitPriceMicrocredits,
|
||||
"input_price_microcredits": item.InputPriceMicrocredits,
|
||||
"output_price_microcredits": item.OutputPriceMicrocredits,
|
||||
"cached_price_microcredits": item.CachedPriceMicrocredits,
|
||||
"legacy_model_ids_json": item.LegacyModelIDsJSON,
|
||||
"updated_at": item.UpdatedAt,
|
||||
})
|
||||
if result.Error != nil {
|
||||
|
||||
Reference in new issue
Block a user