feat: 实名即生效套餐沉默期、延期办理与资产出库时间
Some checks failed
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Failing after 8m39s
Some checks failed
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Failing after 8m39s
- 迁移 000259~000265:套餐记录沉默期字段与扫描索引、套餐默认沉默期、延期政策/流水/订单/批次/明细 5 张表、默认政策与系统配置(总开关默认关闭)、企微审批白名单、卡与设备出库时间及出库记录 - 沉默期设置(订单发放、自动购包、钱包续费)、后台购买时调整(超默认值按政策免审或企微审批)、统一判定与激活闸门、排队与孤儿扫描跳过过期套餐、过期套餐禁止退款、每 10 分钟扫描 - 总开关专用接口与打开前 4 项检查;延期政策;延期资格与计费;H5 自助与后台二维码在线支付(商户池路由)、支付回调与查单恢复、线下登记、特殊/批量延期、异常重试与原路退款;沉默期审批场景与终态处理 - 换货沉默期流水与出库时间;卡/设备列表、详情、导出与出库记录接口;延期订单与即将过期套餐列表及导出;财务流水纳入延期支付 - 沉默期与出库时间回填工具 cmd/silence-backfill;前端接口变更说明 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -37,6 +37,41 @@ type ActivationService struct {
|
||||
priorityEvents priorityapp.PriorityEventWriter
|
||||
auditWriter *audit.Writer
|
||||
preActivationSettler PreActivationSettler // 激活前流量结算,可选
|
||||
silenceGate SilenceGate // 沉默期激活闸门,可选
|
||||
silenceFilter SilenceStatusFilter // 沉默期总开关,可选
|
||||
}
|
||||
|
||||
// SilenceGate 是沉默期激活闸门(add-package-silence-period §5.3):激活事务内、实名判断前判定沉默期;
|
||||
// 返回 false 表示套餐沉默期已过期,任何入口都不能激活。
|
||||
type SilenceGate interface {
|
||||
AllowActivationInTx(ctx context.Context, tx *gorm.DB, usage *model.PackageUsage) (bool, error)
|
||||
}
|
||||
|
||||
// SilenceStatusFilter 返回总开关打开时排队与孤儿扫描需要排除过期套餐的判断。
|
||||
type SilenceStatusFilter interface {
|
||||
Enabled(ctx context.Context) bool
|
||||
}
|
||||
|
||||
// SetSilenceGate 注入沉默期激活闸门与总开关;未注入时行为与现状一致。
|
||||
func (s *ActivationService) SetSilenceGate(gate SilenceGate, filter SilenceStatusFilter) {
|
||||
s.silenceGate = gate
|
||||
s.silenceFilter = filter
|
||||
}
|
||||
|
||||
// excludeSilenceExpired 在总开关打开时为待生效主套餐查询追加"跳过沉默期已过期"条件。
|
||||
func (s *ActivationService) excludeSilenceExpired(ctx context.Context, query *gorm.DB) *gorm.DB {
|
||||
if s.silenceFilter == nil || !s.silenceFilter.Enabled(ctx) {
|
||||
return query
|
||||
}
|
||||
return query.Where("(silence_status IS NULL OR silence_status <> ?)", constants.SilenceStatusExpired)
|
||||
}
|
||||
|
||||
// allowSilence 执行沉默期闸门;未注入时放行。
|
||||
func (s *ActivationService) allowSilence(ctx context.Context, tx *gorm.DB, usage *model.PackageUsage) (bool, error) {
|
||||
if s.silenceGate == nil || usage == nil {
|
||||
return true, nil
|
||||
}
|
||||
return s.silenceGate.AllowActivationInTx(ctx, tx, usage)
|
||||
}
|
||||
|
||||
// PreActivationSettler 在资产从无生效主套餐变为有生效主套餐之前做一次流量结算(尽力而为,不阻塞激活)。
|
||||
@@ -172,6 +207,15 @@ func (s *ActivationService) ActivateByRealname(ctx context.Context, carrierType
|
||||
|
||||
// 检查是否是主套餐
|
||||
if usage.MasterUsageID == nil {
|
||||
// 沉默期闸门:期内实名记为结束(之后照常激活或排队),沉默期已过期的不激活
|
||||
allowed, gateErr := s.allowSilence(ctx, tx, usage)
|
||||
if gateErr != nil {
|
||||
return gateErr
|
||||
}
|
||||
if !allowed {
|
||||
s.logger.Info("套餐沉默期已过期,实名后不激活", zap.Uint("usage_id", usage.ID))
|
||||
continue
|
||||
}
|
||||
// 主套餐:需要检查是否有已激活或已用完(仍在有效期)的主套餐
|
||||
var activeMain model.PackageUsage
|
||||
err := tx.Where("status IN ?", []int{constants.PackageUsageStatusActive, constants.PackageUsageStatusDepleted}).
|
||||
@@ -193,6 +237,17 @@ func (s *ActivationService) ActivateByRealname(ctx context.Context, carrierType
|
||||
}
|
||||
}
|
||||
|
||||
if usage.MasterUsageID != nil {
|
||||
// 挂在沉默期已过期主套餐下的待生效加油包随主套餐一并不可用(D21)
|
||||
masterExpired, masterErr := s.isMasterSilenceExpired(ctx, tx, *usage.MasterUsageID)
|
||||
if masterErr != nil {
|
||||
return masterErr
|
||||
}
|
||||
if masterExpired {
|
||||
continue
|
||||
}
|
||||
}
|
||||
|
||||
terms, termsErr := ResolveUsageTerms(usage, &pkg, s.logger)
|
||||
if termsErr != nil {
|
||||
return termsErr
|
||||
@@ -636,10 +691,12 @@ func (s *ActivationService) activateNextMainPackage(ctx context.Context, tx *gor
|
||||
|
||||
func (s *ActivationService) getNextPendingMainPackage(ctx context.Context, tx *gorm.DB, carrierType string, carrierID uint) (*model.PackageUsage, error) {
|
||||
var nextMain model.PackageUsage
|
||||
err := tx.WithContext(ctx).
|
||||
query := tx.WithContext(ctx).
|
||||
Where("status = ?", constants.PackageUsageStatusPending).
|
||||
Where("master_usage_id IS NULL").
|
||||
Where(carrierType+"_id = ?", carrierID).
|
||||
Where(carrierType+"_id = ?", carrierID)
|
||||
// 沉默期已过期的套餐不能挡住同资产后续套餐(总开关打开时)
|
||||
err := s.excludeSilenceExpired(ctx, query).
|
||||
Order("priority ASC, created_at ASC").
|
||||
First(&nextMain).Error
|
||||
if err != nil {
|
||||
@@ -669,6 +726,10 @@ func (s *ActivationService) canActivatePendingUsage(ctx context.Context, tx *gor
|
||||
if usage == nil {
|
||||
return false, nil
|
||||
}
|
||||
allowed, err := s.allowSilence(ctx, tx, usage)
|
||||
if err != nil || !allowed {
|
||||
return false, err
|
||||
}
|
||||
if !usage.PendingRealnameActivation {
|
||||
return true, nil
|
||||
}
|
||||
@@ -996,3 +1057,22 @@ func (s *ActivationService) InvalidateAllPackagesByAsset(ctx context.Context, as
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// isMasterSilenceExpired 判断主套餐沉默期是否已过期(总开关打开时才生效)。
|
||||
func (s *ActivationService) isMasterSilenceExpired(ctx context.Context, tx *gorm.DB, masterUsageID uint) (bool, error) {
|
||||
if s.silenceFilter == nil || !s.silenceFilter.Enabled(ctx) {
|
||||
return false, nil
|
||||
}
|
||||
var count int64
|
||||
if err := tx.WithContext(ctx).Model(&model.PackageUsage{}).
|
||||
Where("id = ? AND silence_status = ?", masterUsageID, constants.SilenceStatusExpired).
|
||||
Count(&count).Error; err != nil {
|
||||
return false, errors.Wrap(errors.CodeDatabaseError, err, "查询主套餐沉默期状态失败")
|
||||
}
|
||||
return count > 0, nil
|
||||
}
|
||||
|
||||
// SilenceRulesEnabled 返回沉默期总开关是否打开(孤儿扫描等外部查询用于排除过期套餐)。
|
||||
func (s *ActivationService) SilenceRulesEnabled(ctx context.Context) bool {
|
||||
return s != nil && s.silenceFilter != nil && s.silenceFilter.Enabled(ctx)
|
||||
}
|
||||
|
||||
@@ -23,6 +23,8 @@ func FindAttachableMainPackageForAddon(tx *gorm.DB, carrierType string, carrierI
|
||||
},
|
||||
now,
|
||||
).
|
||||
// 沉默期已过期的待生效主套餐不能再挂加油包(D21:其下加油包随主套餐不可用)
|
||||
Where("NOT (status = ? AND silence_status IS NOT NULL AND silence_status = ?)", constants.PackageUsageStatusPending, constants.SilenceStatusExpired).
|
||||
Order("priority ASC")
|
||||
|
||||
switch carrierType {
|
||||
|
||||
@@ -107,5 +107,26 @@ func packageData(pkg *model.Package) map[string]any {
|
||||
"suggested_retail_price": pkg.SuggestedRetailPrice, "price_config_status": pkg.PriceConfigStatus,
|
||||
"is_gift": pkg.IsGift, "status": pkg.Status, "shelf_status": pkg.ShelfStatus,
|
||||
"calendar_type": pkg.CalendarType, "data_reset_cycle": pkg.DataResetCycle, "expiry_base": pkg.ExpiryBase,
|
||||
"silence_period_days": pkg.SilencePeriodDays, "silence_extension_enabled": pkg.SilenceExtensionEnabled,
|
||||
}
|
||||
}
|
||||
|
||||
// appendSilenceDefaultAudit 在默认沉默期或是否支持延期变化时写审计 package.silence_default_changed。
|
||||
// 修改默认值只影响之后的新购买,已有套餐记录的截止日不变。
|
||||
func (s *Service) appendSilenceDefaultAudit(ctx context.Context, tx *gorm.DB, before, after *model.Package) error {
|
||||
if sameIntPointer(before.SilencePeriodDays, after.SilencePeriodDays) && before.SilenceExtensionEnabled == after.SilenceExtensionEnabled {
|
||||
return nil
|
||||
}
|
||||
if s.auditWriter == nil {
|
||||
return nil
|
||||
}
|
||||
beforeData := map[string]any{"silence_period_days": before.SilencePeriodDays, "silence_extension_enabled": before.SilenceExtensionEnabled}
|
||||
afterData := map[string]any{"silence_period_days": after.SilencePeriodDays, "silence_extension_enabled": after.SilenceExtensionEnabled}
|
||||
resource := audit.PackageResource(after, constants.AuditResourceRelationPrimary, constants.AuditResourceRolePackageTarget, beforeData, afterData)
|
||||
return s.auditWriter.AppendSilenceResource(ctx, tx, constants.AuditActionPackageSilenceDefaultChanged,
|
||||
"修改套餐默认沉默期 "+after.PackageCode, resource, nil)
|
||||
}
|
||||
|
||||
func sameIntPointer(left, right *int) bool {
|
||||
return left == nil && right == nil || left != nil && right != nil && *left == *right
|
||||
}
|
||||
|
||||
@@ -149,11 +149,22 @@ func (s *Service) Create(ctx context.Context, req *dto.CreatePackageRequest) (_
|
||||
}
|
||||
pkg.VirtualRatio = calculateVirtualRatio(pkg.EnableVirtualData, pkg.RealDataMB, pkg.VirtualDataMB)
|
||||
pkg.Creator = currentUserID
|
||||
pkg.SilencePeriodDays = req.SilencePeriodDays
|
||||
pkg.SilenceExtensionEnabled = req.SilenceExtensionEnabled == nil || *req.SilenceExtensionEnabled
|
||||
if err := ValidatePackageSilenceConfig(pkg); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
if err := postgres.NewPackageStore(tx).Create(ctx, pkg); err != nil {
|
||||
return errors.Wrap(errors.CodeInternalError, err, "创建套餐失败")
|
||||
}
|
||||
// GORM 对 false 布尔值使用数据库默认值 true,显式关闭时补写一次。
|
||||
if !pkg.SilenceExtensionEnabled {
|
||||
if err := tx.Model(&model.Package{}).Where("id = ?", pkg.ID).Update("silence_extension_enabled", false).Error; err != nil {
|
||||
return errors.Wrap(errors.CodeDatabaseError, err, "保存是否支持延期失败")
|
||||
}
|
||||
}
|
||||
return s.appendPackageAudit(ctx, tx, constants.AuditActionPackageCreated, "创建套餐商品 "+pkg.PackageCode, pkg, nil, packageData(pkg))
|
||||
}); err != nil {
|
||||
return nil, err
|
||||
@@ -283,6 +294,21 @@ func (s *Service) Update(ctx context.Context, id uint, req *dto.UpdatePackageReq
|
||||
if req.ExpiryBase != nil {
|
||||
pkg.ExpiryBase = *req.ExpiryBase
|
||||
}
|
||||
if err := ValidatePackageExpiryBaseChange(&before, before.ExpiryBase, pkg.ExpiryBase, req.SilencePeriodDays != nil); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if req.SilencePeriodDays != nil {
|
||||
pkg.SilencePeriodDays = req.SilencePeriodDays
|
||||
} else if !RequiresSilencePeriod(pkg) {
|
||||
// 套餐不再需要沉默期(如改为加油包)时清空默认值,避免普通套餐残留沉默期配置。
|
||||
pkg.SilencePeriodDays = nil
|
||||
}
|
||||
if req.SilenceExtensionEnabled != nil {
|
||||
pkg.SilenceExtensionEnabled = *req.SilenceExtensionEnabled
|
||||
}
|
||||
if err := ValidatePackageSilenceConfig(pkg); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var rawSuggestedRetailPrice *int64
|
||||
switch {
|
||||
@@ -329,7 +355,10 @@ func (s *Service) Update(ctx context.Context, id uint, req *dto.UpdatePackageReq
|
||||
if err := postgres.NewPackageStore(tx).Update(ctx, pkg); err != nil {
|
||||
return errors.Wrap(errors.CodeInternalError, err, "更新套餐失败")
|
||||
}
|
||||
return s.appendPackageAudit(ctx, tx, constants.AuditActionPackageUpdated, "更新套餐商品 "+pkg.PackageCode, pkg, packageData(&before), packageData(pkg))
|
||||
if err := s.appendPackageAudit(ctx, tx, constants.AuditActionPackageUpdated, "更新套餐商品 "+pkg.PackageCode, pkg, packageData(&before), packageData(pkg)); err != nil {
|
||||
return err
|
||||
}
|
||||
return s.appendSilenceDefaultAudit(ctx, tx, &before, pkg)
|
||||
}); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -390,6 +419,9 @@ func (s *Service) List(ctx context.Context, req *dto.PackageListRequest) ([]*dto
|
||||
if req.PackageType != nil {
|
||||
filters["package_type"] = *req.PackageType
|
||||
}
|
||||
if req.SilenceUnconfigured != nil && *req.SilenceUnconfigured {
|
||||
filters["silence_unconfigured"] = true
|
||||
}
|
||||
|
||||
packages, total, err := s.packageStore.List(ctx, opts, filters)
|
||||
if err != nil {
|
||||
@@ -818,6 +850,9 @@ func initPackageExpiryBaseFields(resp *dto.PackageResponse, pkg *model.Package)
|
||||
resp.DefaultExpiryBaseName = ExpiryBaseName(pkg.ExpiryBase)
|
||||
resp.EffectiveExpiryBase = pkg.ExpiryBase
|
||||
resp.EffectiveExpiryBaseName = ExpiryBaseName(pkg.ExpiryBase)
|
||||
resp.SilencePeriodDays = pkg.SilencePeriodDays
|
||||
resp.SilenceExtensionEnabled = pkg.SilenceExtensionEnabled
|
||||
resp.SilenceConfigRequired = RequiresSilencePeriod(pkg)
|
||||
}
|
||||
|
||||
func applyAllocationExpiryBase(resp *dto.PackageResponse, pkg *model.Package, allocation *model.ShopPackageAllocation) {
|
||||
|
||||
@@ -47,3 +47,52 @@ func ExpiryBaseOverrideName(value *string) string {
|
||||
}
|
||||
return ExpiryBaseName(*value)
|
||||
}
|
||||
|
||||
// ValidateAllocationExpiryBaseOverride 校验分配覆盖不得改变套餐生效条件(add-package-silence-period §3.3)。
|
||||
// 套餐服务与店铺分配(单个、批量、系列授权)写入路径共用:
|
||||
// 覆盖把实名即生效套餐改成购买即生效会绕过沉默期;把购买即生效套餐改成实名即生效时该套餐没有默认沉默期,两者都阻断。
|
||||
// 覆盖为空(跟随套餐默认)或与套餐一致时放行;加油包不进入沉默期,不受此约束。
|
||||
func ValidateAllocationExpiryBaseOverride(pkg *model.Package, override *string) error {
|
||||
if pkg == nil || override == nil || pkg.PackageType == constants.PackageTypeAddon {
|
||||
return nil
|
||||
}
|
||||
if *override != pkg.ExpiryBase {
|
||||
return errors.New(errors.CodePackageExpiryBaseChangeForbidden,
|
||||
"套餐「"+pkg.PackageName+"」不允许通过分配覆盖改变生效条件(实名即生效与购买即生效不能互相覆盖)")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// ValidatePackageExpiryBaseChange 校验套餐自身生效条件变更(§3.3):实名即生效改为购买即生效阻断;
|
||||
// 购买即生效改为实名即生效时,同一请求必须提供默认沉默期。
|
||||
func ValidatePackageExpiryBaseChange(pkg *model.Package, before, after string, silenceDaysSubmitted bool) error {
|
||||
if pkg == nil || pkg.PackageType == constants.PackageTypeAddon || before == after {
|
||||
return nil
|
||||
}
|
||||
if before == constants.PackageExpiryBaseFromActivation && after == constants.PackageExpiryBaseFromPurchase {
|
||||
return errors.New(errors.CodePackageExpiryBaseChangeForbidden, "实名即生效套餐不允许改为购买即生效")
|
||||
}
|
||||
if before == constants.PackageExpiryBaseFromPurchase && after == constants.PackageExpiryBaseFromActivation && !silenceDaysSubmitted {
|
||||
return errors.New(errors.CodeSilencePeriodOutOfRange, "改为实名即生效时必须同时设置默认沉默期(1~90 天)")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// RequiresSilencePeriod 判断套餐是否必须配置默认沉默期:实名即生效的正式套餐。
|
||||
func RequiresSilencePeriod(pkg *model.Package) bool {
|
||||
return pkg != nil && pkg.PackageType != constants.PackageTypeAddon && pkg.ExpiryBase == constants.PackageExpiryBaseFromActivation
|
||||
}
|
||||
|
||||
// ValidatePackageSilenceConfig 校验套餐最终的沉默期配置:实名即生效正式套餐必填 1~90 天;其他套餐不得填写。
|
||||
func ValidatePackageSilenceConfig(pkg *model.Package) error {
|
||||
if RequiresSilencePeriod(pkg) {
|
||||
if pkg.SilencePeriodDays == nil || *pkg.SilencePeriodDays < constants.SilencePackageDaysMin || *pkg.SilencePeriodDays > constants.SilencePackageDaysMax {
|
||||
return errors.New(errors.CodeSilencePeriodOutOfRange, "实名即生效套餐必须配置默认沉默期(1~90 天)")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
if pkg != nil && pkg.SilencePeriodDays != nil {
|
||||
return errors.New(errors.CodeInvalidParam, "只有实名即生效的正式套餐可以配置沉默期")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user