赠送套餐逻辑

internal/model/dto/client_asset_dto.go

@@ -143,7 +143,7 @@ type ClientPackageItem struct {
 	PackageID     uint   `json:"package_id" description:"套餐ID"`
 	PackageName   string `json:"package_name" description:"套餐名称"`
 	PackageType   string `json:"package_type" description:"套餐类型 (formal:正式套餐, addon:加油包)"`
-	RetailPrice   int64  `json:"retail_price" description:"零售价（分）"`
+	RetailPrice   int64  `json:"retail_price" description:"生效零售价（分）"`
 	CostPrice     int64  `json:"cost_price" description:"成本价（分）"`
 	ValidityDays  int    `json:"validity_days" description:"有效天数"`
 	IsAddon       bool   `json:"is_addon" description:"是否加油包"`

internal/model/dto/package_dto.go

@@ -6,11 +6,12 @@ type CreatePackageRequest struct {
 	PackageName          string  `json:"package_name" validate:"required,min=1,max=255" required:"true" minLength:"1" maxLength:"255" description:"套餐名称"`
 	SeriesID             *uint   `json:"series_id" validate:"omitempty" description:"套餐系列ID"`
 	PackageType          string  `json:"package_type" validate:"required,oneof=formal addon" required:"true" description:"套餐类型 (formal:正式套餐, addon:附加套餐)"`
+	IsGift               bool    `json:"is_gift" description:"是否赠送套餐"`
 	DurationMonths       int     `json:"duration_months" validate:"required,min=1,max=120" required:"true" minimum:"1" maximum:"120" description:"套餐时长(月数)"`
 	RealDataMB           *int64  `json:"real_data_mb" validate:"omitempty,min=0" minimum:"0" description:"真流量额度(MB)"`
 	VirtualDataMB        *int64  `json:"virtual_data_mb" validate:"omitempty,min=0" minimum:"0" description:"虚流量额度(MB)"`
 	EnableVirtualData    bool    `json:"enable_virtual_data" description:"是否启用虚流量"`
-	SuggestedRetailPrice *int64  `json:"suggested_retail_price" validate:"omitempty,min=0" minimum:"0" description:"建议售价(分)"`
+	SuggestedRetailPrice *int64  `json:"suggested_retail_price" validate:"omitempty,min=0" minimum:"0" description:"建议售价原始值(分，普通可售套餐留空表示未配置，赠送套餐必须显式为0)"`
 	CostPrice            int64   `json:"cost_price" validate:"required,min=0" required:"true" minimum:"0" description:"成本价(分)"`
 	CalendarType         *string `json:"calendar_type" validate:"omitempty,oneof=natural_month by_day" description:"套餐周期类型 (natural_month:自然月, by_day:按天)"`
 	DurationDays         *int    `json:"duration_days" validate:"omitempty,min=1,max=3650" minimum:"1" maximum:"3650" description:"套餐天数(calendar_type=by_day时必填)"`
@@ -23,11 +24,13 @@ type UpdatePackageRequest struct {
 	PackageName          *string `json:"package_name" validate:"omitempty,min=1,max=255" minLength:"1" maxLength:"255" description:"套餐名称"`
 	SeriesID             *uint   `json:"series_id" validate:"omitempty" description:"套餐系列ID"`
 	PackageType          *string `json:"package_type" validate:"omitempty,oneof=formal addon" description:"套餐类型 (formal:正式套餐, addon:附加套餐)"`
+	IsGift               *bool   `json:"is_gift" description:"是否赠送套餐"`
 	DurationMonths       *int    `json:"duration_months" validate:"omitempty,min=1,max=120" minimum:"1" maximum:"120" description:"套餐时长(月数)"`
 	RealDataMB           *int64  `json:"real_data_mb" validate:"omitempty,min=0" minimum:"0" description:"真流量额度(MB)"`
 	VirtualDataMB        *int64  `json:"virtual_data_mb" validate:"omitempty,min=0" minimum:"0" description:"虚流量额度(MB)"`
 	EnableVirtualData    *bool   `json:"enable_virtual_data" description:"是否启用虚流量"`
-	SuggestedRetailPrice *int64  `json:"suggested_retail_price" validate:"omitempty,min=0" minimum:"0" description:"建议售价(分)"`
+	SuggestedRetailPrice *int64  `json:"suggested_retail_price" validate:"omitempty,min=0" minimum:"0" description:"建议售价原始值(分，普通可售套餐留空表示未配置，赠送套餐必须显式为0)"`
+	ClearSuggestedRetailPrice bool `json:"clear_suggested_retail_price" description:"是否清空建议售价并恢复为未配置状态"`
 	CostPrice            *int64  `json:"cost_price" validate:"omitempty,min=0" minimum:"0" description:"成本价(分)"`
 	CalendarType         *string `json:"calendar_type" validate:"omitempty,oneof=natural_month by_day" description:"套餐周期类型 (natural_month:自然月, by_day:按天)"`
 	DurationDays         *int    `json:"duration_days" validate:"omitempty,min=1,max=3650" minimum:"1" maximum:"3650" description:"套餐天数(calendar_type=by_day时必填)"`
@@ -58,7 +61,7 @@ type UpdatePackageShelfStatusRequest struct {
 
 // UpdateRetailPriceRequest 更新零售价请求
 type UpdateRetailPriceRequest struct {
-	RetailPrice int64 `json:"retail_price" validate:"required,min=0" required:"true" minimum:"0" description:"零售价（单位：分）"`
+	RetailPrice int64 `json:"retail_price" validate:"required,min=0" required:"true" minimum:"0" description:"零售价原始值（分，普通可售套餐不允许显式0）"`
 }
 
 // CommissionTierInfo 返佣梯度信息
@@ -76,12 +79,15 @@ type PackageResponse struct {
 	SeriesID                *uint               `json:"series_id" description:"套餐系列ID"`
 	SeriesName              *string             `json:"series_name" description:"套餐系列名称"`
 	PackageType             string              `json:"package_type" description:"套餐类型 (formal:正式套餐, addon:附加套餐)"`
+	IsGift                  bool                `json:"is_gift" description:"是否赠送套餐"`
 	DurationMonths          int                 `json:"duration_months" description:"套餐时长(月数)"`
 	RealDataMB              int64               `json:"real_data_mb" description:"真流量额度(MB)"`
 	VirtualDataMB           int64               `json:"virtual_data_mb" description:"虚流量额度(MB)"`
 	EnableVirtualData       bool                `json:"enable_virtual_data" description:"是否启用虚流量"`
 	VirtualRatio            float64             `json:"virtual_ratio" description:"虚流量比例(real_data_mb/virtual_data_mb)，启用虚流量时计算，否则为1.0"`
-	SuggestedRetailPrice    int64               `json:"suggested_retail_price" description:"建议售价(分)"`
+	SuggestedRetailPrice    *int64              `json:"suggested_retail_price,omitempty" description:"建议售价原始值(分，未配置时为空)"`
+	PriceConfigStatus       int                 `json:"price_config_status" description:"价格配置状态 (0:未配置, 1:赠送0价, 2:已配置非0)"`
+	PriceConfigStatusName   string              `json:"price_config_status_name" description:"价格配置状态名称（中文）"`
 	CostPrice               int64               `json:"cost_price" description:"成本价(分)"`
 	OneTimeCommissionAmount *int64              `json:"one_time_commission_amount,omitempty" description:"一次性佣金金额（分，代理视角）"`
 	Status                  int                 `json:"status" description:"状态 (0:禁用, 1:启用)"`
@@ -90,7 +96,9 @@ type PackageResponse struct {
 	ShelfStatusName         string              `json:"shelf_status_name" description:"上架状态名称（中文）"`
 	CreatedAt               string              `json:"created_at" description:"创建时间"`
 	UpdatedAt               string              `json:"updated_at" description:"更新时间"`
-	RetailPrice             *int64              `json:"retail_price,omitempty" description:"代理零售价（分），仅代理用户可见"`
+	RetailPrice             *int64              `json:"retail_price,omitempty" description:"代理零售价原始值（分，仅代理用户可见，未配置时为空）"`
+	RetailPriceConfigStatus *int                `json:"retail_price_config_status,omitempty" description:"代理零售价配置状态 (0:未配置, 1:赠送0价, 2:已配置非0)"`
+	EffectiveRetailPrice    *int64              `json:"effective_retail_price,omitempty" description:"生效零售价（分，仅销售链路展示使用）"`
 	ProfitMargin            *int64              `json:"profit_margin,omitempty" description:"利润空间（分，仅代理用户可见）"`
 	CurrentCommissionRate   string              `json:"current_commission_rate,omitempty" description:"当前返佣比例（仅代理用户可见）"`
 	TierInfo                *CommissionTierInfo `json:"tier_info,omitempty" description:"梯度返佣信息（仅代理用户可见）"`

internal/model/order.go

@@ -130,6 +130,8 @@ type OrderItem struct {
 	Quantity    int     `gorm:"column:quantity;type:int;default:1;not null;comment:数量" json:"quantity"`
 	UnitPrice   int64   `gorm:"column:unit_price;type:bigint;not null;comment:单价(分)" json:"unit_price"`
 	Amount      int64   `gorm:"column:amount;type:bigint;not null;comment:小计金额(分)" json:"amount"`
+	PackagePriceConfigStatus int  `gorm:"column:package_price_config_status;type:int;default:0;not null;comment:套餐价格配置状态快照 0-未配置 1-赠送0价 2-已配置非0" json:"package_price_config_status"`
+	PackageIsGift            bool `gorm:"column:package_is_gift;type:boolean;default:false;not null;comment:套餐是否赠送快照 true-赠送 false-普通可售" json:"package_is_gift"`
 }
 
 // TableName 指定表名

internal/model/package.go

@@ -41,6 +41,8 @@ type Package struct {
 	Status               int    `gorm:"column:status;type:int;default:1;not null;comment:状态 0=禁用 1=启用" json:"status"`
 	CostPrice            int64  `gorm:"column:cost_price;type:bigint;default:0;comment:成本价(分为单位)" json:"cost_price"`
 	SuggestedRetailPrice int64  `gorm:"column:suggested_retail_price;type:bigint;default:0;comment:建议售价(分为单位)" json:"suggested_retail_price"`
+	PriceConfigStatus    int    `gorm:"column:price_config_status;type:int;default:0;not null;comment:价格配置状态 0-未配置 1-赠送0价 2-已配置非0" json:"price_config_status"`
+	IsGift               bool   `gorm:"column:is_gift;type:boolean;default:false;not null;comment:是否赠送套餐 true-赠送 false-普通可售" json:"is_gift"`
 	ShelfStatus          int    `gorm:"column:shelf_status;type:int;default:2;not null;comment:上架状态 1-上架 2-下架" json:"shelf_status"`
 	CalendarType         string `gorm:"column:calendar_type;type:varchar(20);default:'by_day';comment:套餐周期类型 natural_month-自然月 by_day-按天" json:"calendar_type"`
 	DurationDays         int    `gorm:"column:duration_days;type:int;comment:套餐天数(calendar_type=by_day时必填)" json:"duration_days"`
@@ -83,6 +85,8 @@ type PackageUsage struct {
 	PendingRealnameActivation bool       `gorm:"column:pending_realname_activation;type:boolean;default:false;comment:是否等待实名激活(true-待实名后激活 false-已激活或不需实名)" json:"pending_realname_activation"`
 	PackageName               string     `gorm:"column:package_name;type:varchar(255);not null;default:'';comment:套餐名称快照(从Package复制,用于历史记录展示)" json:"package_name"`
 	PaidAmount                *int64     `gorm:"column:paid_amount;type:bigint;comment:购买实付金额快照（分，从订单复制，无订单或线下支付时为null）" json:"paid_amount,omitempty"`
+	PackagePriceConfigStatus  int        `gorm:"column:package_price_config_status;type:int;default:0;not null;comment:套餐价格配置状态快照 0-未配置 1-赠送0价 2-已配置非0" json:"package_price_config_status"`
+	PackageIsGift             bool       `gorm:"column:package_is_gift;type:boolean;default:false;not null;comment:套餐是否赠送快照 true-赠送 false-普通可售" json:"package_is_gift"`
 	DataResetCycle            string     `gorm:"column:data_reset_cycle;type:varchar(20);comment:流量重置周期(从Package复制,用于历史记录)" json:"data_reset_cycle"`
 	LastResetAt               *time.Time `gorm:"column:last_reset_at;comment:最后一次流量重置时间" json:"last_reset_at"`
 	NextResetAt               *time.Time `gorm:"column:next_reset_at;index:idx_package_usage_next_reset_at;comment:下次流量重置时间(用于定时任务查询)" json:"next_reset_at"`

internal/model/shop_package_allocation.go

@@ -15,6 +15,7 @@ type ShopPackageAllocation struct {
 	Status             int   `gorm:"column:status;type:int;default:1;not null;comment:状态 0=禁用 1=启用" json:"status"`
 	ShelfStatus        int   `gorm:"column:shelf_status;type:int;default:1;not null;comment:上架状态 1-上架 2-下架" json:"shelf_status"`
 	RetailPrice        int64 `gorm:"column:retail_price;type:bigint;not null;default:0;comment:代理面向终端客户的零售价（分）" json:"retail_price"`
+	RetailPriceConfigStatus int `gorm:"column:retail_price_config_status;type:int;default:0;not null;comment:零售价配置状态 0-未配置 1-赠送0价 2-已配置非0" json:"retail_price_config_status"`
 }
 
 // TableName 指定表名