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:
@@ -227,6 +227,19 @@ func approvalBusinessResource(ctx context.Context, tx *gorm.DB, businessType str
|
||||
"amount": attempt.Amount, "approval_instance_id": instanceID,
|
||||
},
|
||||
}}, nil
|
||||
case constants.ApprovalBusinessTypePackageSilence:
|
||||
var batch model.PackageSilenceExtensionBatch
|
||||
if err := tx.WithContext(ctx).First(&batch, businessID).Error; err != nil {
|
||||
return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询审批关联沉默期批次失败")
|
||||
}
|
||||
return []ResourceInput{{
|
||||
Type: AuditResourcePackageSilenceBatch, ID: &id, Key: batch.BatchNo, DisplayName: "沉默期申请 " + batch.BatchNo,
|
||||
Relation: constants.AuditResourceRelationReference, Role: constants.AuditResourceRoleApprovalBusiness,
|
||||
IdentitySnapshot: map[string]any{
|
||||
"id": batch.ID, "batch_no": batch.BatchNo, "path": batch.Path, "extension_type": batch.ExtensionType,
|
||||
"status": batch.Status, "approval_instance_id": instanceID,
|
||||
},
|
||||
}}, nil
|
||||
default:
|
||||
return nil, errors.New(errors.CodeInvalidParam, "审批业务类型尚未注册审计资源")
|
||||
}
|
||||
|
||||
81
internal/infrastructure/audit/package_silence.go
Normal file
81
internal/infrastructure/audit/package_silence.go
Normal file
@@ -0,0 +1,81 @@
|
||||
package audit
|
||||
|
||||
import (
|
||||
"context"
|
||||
"strconv"
|
||||
|
||||
"gorm.io/gorm"
|
||||
|
||||
"github.com/break/junhong_cmp_fiber/internal/model"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/auditcontext"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/constants"
|
||||
)
|
||||
|
||||
// SilenceAuditInput 是沉默期相关审计事实。
|
||||
type SilenceAuditInput struct {
|
||||
ActionCode string
|
||||
Summary string
|
||||
Usage *model.PackageUsage
|
||||
BeforeData map[string]any
|
||||
AfterData map[string]any
|
||||
Metadata map[string]any
|
||||
}
|
||||
|
||||
// AppendSilenceUsage 在调用方事务内追加一条套餐记录级沉默期审计。
|
||||
// 请求上下文没有操作者时(Worker、定时任务、回调)按系统任务记录。
|
||||
func (w *Writer) AppendSilenceUsage(ctx context.Context, tx *gorm.DB, input SilenceAuditInput) error {
|
||||
if w == nil || input.Usage == nil || input.Usage.ID == 0 {
|
||||
return nil
|
||||
}
|
||||
resource := PackageUsageResource(input.Usage, constants.AuditResourceRelationPrimary,
|
||||
constants.AuditResourceRolePackageUsageTarget, input.BeforeData, input.AfterData)
|
||||
return w.Append(ctx, tx, silenceAppendInput(ctx, input.ActionCode, input.Summary, input.Metadata, []ResourceInput{resource}))
|
||||
}
|
||||
|
||||
// AppendSilenceResource 追加一条主资源为非套餐记录(套餐、政策、配置、出库记录)的沉默期审计。
|
||||
func (w *Writer) AppendSilenceResource(ctx context.Context, tx *gorm.DB, actionCode, summary string, resource ResourceInput, metadata map[string]any) error {
|
||||
if w == nil {
|
||||
return nil
|
||||
}
|
||||
resource.Relation = constants.AuditResourceRelationPrimary
|
||||
if resource.Role == "" {
|
||||
resource.Role = constants.AuditResourceRoleConfig
|
||||
}
|
||||
return w.Append(ctx, tx, silenceAppendInput(ctx, actionCode, summary, metadata, []ResourceInput{resource}))
|
||||
}
|
||||
|
||||
// SilencePolicyResource 构造延期政策审计资源。
|
||||
func SilencePolicyResource(policy *model.PackageSilenceExtensionPolicy, beforeData, afterData map[string]any) ResourceInput {
|
||||
id := strconv.FormatUint(uint64(policy.ID), 10)
|
||||
return ResourceInput{
|
||||
Type: AuditResourcePackageSilencePolicy, ID: &id, Key: id, DisplayName: policy.Name,
|
||||
IdentitySnapshot: map[string]any{"id": policy.ID, "name": policy.Name, "scope_type": policy.ScopeType, "status": policy.Status},
|
||||
BeforeData: beforeData, AfterData: afterData,
|
||||
}
|
||||
}
|
||||
|
||||
// AssetOutboundResource 构造出库记录审计资源。
|
||||
func AssetOutboundResource(record *model.AssetOutboundRecord, afterData map[string]any) ResourceInput {
|
||||
id := strconv.FormatUint(uint64(record.ID), 10)
|
||||
return ResourceInput{
|
||||
Type: AuditResourceAssetOutboundRecord, ID: &id, Key: id, DisplayName: record.AssetIdentifierSnapshot,
|
||||
Role: constants.AuditResourceRoleConfig,
|
||||
IdentitySnapshot: map[string]any{
|
||||
"id": record.ID, "asset_type": record.AssetType, "asset_id": record.AssetID,
|
||||
"generation": record.Generation, "source": record.Source,
|
||||
},
|
||||
AfterData: afterData,
|
||||
}
|
||||
}
|
||||
|
||||
func silenceAppendInput(ctx context.Context, actionCode, summary string, metadata map[string]any, resources []ResourceInput) AppendInput {
|
||||
input := AppendInput{
|
||||
ActionCode: actionCode, Summary: summary, ScopeType: constants.AuditScopePlatform,
|
||||
Result: constants.AuditResultSuccess, Metadata: metadata, Resources: resources,
|
||||
}
|
||||
if auditcontext.From(ctx).ActorID == "" {
|
||||
input.Actor = ActorInput{Kind: constants.AuditActorSystemTask, ID: "package_silence", Name: "沉默期规则"}
|
||||
input.Source = constants.AuditSourceWorker
|
||||
}
|
||||
return input
|
||||
}
|
||||
82
internal/infrastructure/audit/package_silence_registry.go
Normal file
82
internal/infrastructure/audit/package_silence_registry.go
Normal file
@@ -0,0 +1,82 @@
|
||||
package audit
|
||||
|
||||
import "github.com/break/junhong_cmp_fiber/pkg/constants"
|
||||
|
||||
// 沉默期审计动作与资源注册(add-package-silence-period,技术方案 §11.2)。
|
||||
// 沉默期判定可能发生在后台、C 端、支付回调、Worker 与定时任务,所有套餐记录级动作都放开这些入口。
|
||||
|
||||
const (
|
||||
// AuditResourcePackageSilencePolicy 沉默期延期政策资源。
|
||||
AuditResourcePackageSilencePolicy = "package_silence_policy"
|
||||
// AuditResourcePackageSilenceBatch 沉默期申请批次资源(审批关联业务)。
|
||||
AuditResourcePackageSilenceBatch = "package_silence_batch"
|
||||
// AuditResourceAssetOutboundRecord 资产出库记录资源。
|
||||
AuditResourceAssetOutboundRecord = "asset_outbound_record"
|
||||
)
|
||||
|
||||
func silenceAuditOrigins() []ActionOrigin {
|
||||
return []ActionOrigin{
|
||||
{Actor: constants.AuditActorAccount, Source: constants.AuditSourceAdminAPI},
|
||||
{Actor: constants.AuditActorSystemTask, Source: constants.AuditSourceWorker},
|
||||
{Actor: constants.AuditActorScheduledJob, Source: constants.AuditSourceScheduler},
|
||||
{Actor: constants.AuditActorOpenAPI, Source: constants.AuditSourceOpenAPI},
|
||||
{Actor: constants.AuditActorPersonalCustomer, Source: constants.AuditSourcePersonalAPI},
|
||||
{Actor: constants.AuditActorExternalSystem, Source: constants.AuditSourceCallback},
|
||||
}
|
||||
}
|
||||
|
||||
func silenceAction(code, name, primaryResource, category, risk string) ActionDefinition {
|
||||
return ActionDefinition{
|
||||
Code: code, Name: name, Category: category, Risk: risk,
|
||||
PrimaryResource: primaryResource, RequireTransaction: true,
|
||||
DefaultVisibility: constants.AuditSubjectInternalOnly,
|
||||
AllowedVisibility: []string{constants.AuditSubjectInternalOnly, constants.AuditSubjectResult},
|
||||
AllowedOrigins: silenceAuditOrigins(),
|
||||
}
|
||||
}
|
||||
|
||||
func registerPackageSilenceAudit(registry *Registry) {
|
||||
usage := constants.AuditResourcePackageUsage
|
||||
business := constants.AuditCategoryBusiness
|
||||
config := constants.AuditCategoryConfiguration
|
||||
normal := constants.AuditRiskNormal
|
||||
high := constants.AuditRiskHigh
|
||||
actions := []ActionDefinition{
|
||||
silenceAction(constants.AuditActionPackageSilenceDefaultChanged, "修改套餐默认沉默期", constants.AuditResourcePackage, config, normal),
|
||||
silenceAction(constants.AuditActionPackageSilenceSwitchChanged, "切换沉默期总开关", constants.AuditResourceSystemConfig, config, high),
|
||||
silenceAction(constants.AuditActionUsageSilenceSet, "设置套餐沉默期", usage, business, normal),
|
||||
silenceAction(constants.AuditActionUsageSilenceAdjustRequested, "申请购买时调整沉默期", usage, business, normal),
|
||||
silenceAction(constants.AuditActionUsageSilenceAdjustApproved, "购买时调整沉默期审批通过", usage, business, normal),
|
||||
silenceAction(constants.AuditActionUsageSilenceAdjustRejected, "购买时调整沉默期审批驳回", usage, business, normal),
|
||||
silenceAction(constants.AuditActionUsageSilenceExpired, "套餐沉默期过期", usage, business, normal),
|
||||
silenceAction(constants.AuditActionUsageSilenceEnded, "套餐沉默期结束(期内实名)", usage, business, normal),
|
||||
silenceAction(constants.AuditActionUsageSilenceExtensionRequested, "申请沉默期延期", usage, business, normal),
|
||||
silenceAction(constants.AuditActionUsageSilenceExtensionApproved, "沉默期延期审批通过", usage, business, normal),
|
||||
silenceAction(constants.AuditActionUsageSilenceExtensionRejected, "沉默期延期审批驳回", usage, business, normal),
|
||||
silenceAction(constants.AuditActionUsageSilenceExtensionApplied, "沉默期延期生效", usage, business, high),
|
||||
silenceAction(constants.AuditActionUsageSilenceExtensionException, "沉默期延期执行异常", usage, business, high),
|
||||
silenceAction(constants.AuditActionUsageSilenceExtensionOrderState, "沉默期延期订单状态变化", usage, business, normal),
|
||||
silenceAction(constants.AuditActionUsageSilenceMigratedOnExchange, "换货迁移套餐沉默期", usage, business, normal),
|
||||
silenceAction(constants.AuditActionUsageSilenceBackfilled, "回填套餐沉默期", usage, business, normal),
|
||||
silenceAction(constants.AuditActionSilencePolicyCreated, "新增沉默期延期政策", AuditResourcePackageSilencePolicy, config, normal),
|
||||
silenceAction(constants.AuditActionSilencePolicyUpdated, "修改沉默期延期政策", AuditResourcePackageSilencePolicy, config, normal),
|
||||
silenceAction(constants.AuditActionSilencePolicyStatusChanged, "启停沉默期延期政策", AuditResourcePackageSilencePolicy, config, normal),
|
||||
silenceAction(constants.AuditActionAssetOutboundRecorded, "记录资产出库时间", AuditResourceAssetOutboundRecord, business, normal),
|
||||
silenceAction(constants.AuditActionAssetOutboundEnded, "结束资产出库记录", AuditResourceAssetOutboundRecord, business, normal),
|
||||
}
|
||||
for _, action := range actions {
|
||||
registry.actionsByCode[action.Code] = action
|
||||
}
|
||||
registry.resources[AuditResourcePackageSilencePolicy] = ResourceDefinition{
|
||||
Type: AuditResourcePackageSilencePolicy, Name: "沉默期延期政策",
|
||||
IdentityFields: []string{"id", "name", "scope_type", "status"},
|
||||
}
|
||||
registry.resources[AuditResourcePackageSilenceBatch] = ResourceDefinition{
|
||||
Type: AuditResourcePackageSilenceBatch, Name: "沉默期申请批次",
|
||||
IdentityFields: []string{"id", "batch_no", "path", "extension_type", "status", "approval_instance_id"},
|
||||
}
|
||||
registry.resources[AuditResourceAssetOutboundRecord] = ResourceDefinition{
|
||||
Type: AuditResourceAssetOutboundRecord, Name: "资产出库记录",
|
||||
IdentityFields: []string{"id", "asset_type", "asset_id", "generation", "source"},
|
||||
}
|
||||
}
|
||||
@@ -481,7 +481,7 @@ func NewRegistry() *Registry {
|
||||
constants.AuditActionAssetAutoRenewalRenewed, "资产钱包自动续费完成", constants.AuditRiskHigh)
|
||||
assetAutoRenewalFailed := assetAutoRenewalAction(
|
||||
constants.AuditActionAssetAutoRenewalFailed, "资产钱包自动续费失败或跳过", constants.AuditRiskNormal)
|
||||
return &Registry{
|
||||
registry := &Registry{
|
||||
actionsByOperation: map[string]ActionDefinition{
|
||||
constants.AuditOperationSystemConfigUpdate: systemConfigUpdated,
|
||||
constants.AuditOperationAssetAutoRenewalConfigUpdate: assetAutoRenewalConfigUpdated,
|
||||
@@ -1184,6 +1184,8 @@ func NewRegistry() *Registry {
|
||||
},
|
||||
},
|
||||
}
|
||||
registerPackageSilenceAudit(registry)
|
||||
return registry
|
||||
}
|
||||
|
||||
func accountSecurityAction(code, name, risk string) ActionDefinition {
|
||||
|
||||
Reference in New Issue
Block a user