Some checks failed
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Has been cancelled
AUG26-008。
- 迁移 000214–000217:tb_shop 全局唯一且不可修改的随机分销码(含存量回填)、
tb_agent_distribution_registration 待审批注册记录、tb_withdrawal_qualification 资料版本、
tb_commission_withdrawal_request_attempt 审批尝试记录,以及提现申请的 latest_*/异常标记列;
不修改既有迁移,down 在存在本 Change 业务事实或新类型场景行时拒绝破坏性回滚。
- 公开接口 POST /api/c/v1/agent-distribution-registrations:无认证,复用既有短信验证码校验、
消费与限流;无效分销码、停用上级、验证码无效或已消费统一返回「分销码不可用」且不落库,
审批通过前不创建店铺、账号或钱包。
- 审批通过才在同一事务内建启用店铺、代理主账号、钱包、上级层级与业务员快照,驳回不建实体,
重复回调不重复建实体,提交后清理上级下级缓存。
- 提现资料资格按不可变版本保存,替换合同或法人身份证即新增版本并同事务失效旧有效版本;
超管作废原因必填;代理停用与店铺删除联动失效。
- 提现每次提交或重提新增不可变审批尝试记录并冻结金额;企业微信通过仅一次从冻结扣减、
保持状态 2 并写 paid_at(不使用状态 4),驳回/cancelled/deleted 仅一次释放,
通过后撤销不回滚、不重新冻结、只写正交异常标记;加锁顺序统一为申请→尝试→钱包。
- 本地人工终审对已关联审批实例的申请返回状态冲突,approval_instance_id 为空的存量申请保持既有行为,
不新增任何配置开关。
- 补齐审批业务类型注册点全集:业务类型与场景字段常量、场景 DTO 两处枚举与中文描述、
场景字段白名单/合法类型/中文名、数据库 CHECK、Worker 决策消费者与装配、审批审计资源映射,
以及三个新审计资源与 13 个审计动作;失败/拒绝审计改为必达。
- 新增后台路由与 OpenAPI:资格提交/查询/作废、提现申请/重提/详情、店铺详情返回只读分销码。
- 归档本 Change:主 Spec 新增 agent-distribution-withdrawal 能力(5 个 Requirement)。
验证(junhong_cmp_test + Redis DB 6,显式 DB_*,未重置整库):
- 迁移 up → version 217 且 dirty=false → down 3 → up 回 217,fixture 复核残留为 0。
- 受控状态机脚手架 227 项通过 / 0 项失败,覆盖 18 组场景(幂等与乱序回调、资金冻结/释放/重提、
退款回扣 × 在途提现并发、负向场景拒绝审计与 14 个动作码审计真实落库)。
- gofmt 空、go build/go vet 通过、gendocs 与工作区逐字节一致、context-health 通过、
openspec validate --strict 通过、doctor healthy;自动化测试按项目决策为 N/A。
运行期前置(未完成,非代码交付物):由超管经 PUT /api/admin/wecom/scenes/{business_type} 为
agent_distribution_approval、withdrawal_qualification_approval、commission_withdrawal_approval
配置启用场景与模板控件映射;未配置时相应提交失败关闭。
247 lines
12 KiB
Go
247 lines
12 KiB
Go
package audit
|
|
|
|
import (
|
|
"context"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/bytedance/sonic"
|
|
"gorm.io/gorm"
|
|
|
|
approvalapp "github.com/break/junhong_cmp_fiber/internal/application/approval"
|
|
"github.com/break/junhong_cmp_fiber/internal/model"
|
|
"github.com/break/junhong_cmp_fiber/pkg/constants"
|
|
"github.com/break/junhong_cmp_fiber/pkg/errors"
|
|
)
|
|
|
|
// WriteApproval 将通用审批状态变化及其 Integration/Outbox 引用写入统一 Audit Event。
|
|
func (w *Writer) WriteApproval(ctx context.Context, tx *gorm.DB, change approvalapp.AuditChange) error {
|
|
if change.InstanceID == 0 || change.BusinessID == 0 || change.BusinessType == "" || change.SubmitterAccountID == 0 {
|
|
return errors.New(errors.CodeInvalidParam, "通用审批审计资源不完整")
|
|
}
|
|
resources, err := approvalResources(ctx, tx, change)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
result := change.Result
|
|
if result == "" {
|
|
result = constants.AuditResultSuccess
|
|
}
|
|
return w.Append(ctx, tx, AppendInput{
|
|
EventID: change.EventID, ActionCode: change.ActionCode, Summary: change.Summary,
|
|
Actor: ActorInput{Kind: change.ActorKind, ID: change.ActorID, Name: change.ActorName}, Source: change.Source,
|
|
ScopeType: constants.AuditScopePlatform, Result: result, ErrorSummary: change.ErrorSummary,
|
|
CorrelationID: change.CorrelationID, ParentEventID: change.ParentEventID,
|
|
Metadata: map[string]any{"provider": change.Provider, "decision": change.Decision}, Resources: resources,
|
|
})
|
|
}
|
|
|
|
func approvalResources(ctx context.Context, tx *gorm.DB, change approvalapp.AuditChange) ([]ResourceInput, error) {
|
|
instanceID := strconv.FormatUint(uint64(change.InstanceID), 10)
|
|
resources := []ResourceInput{{
|
|
Type: constants.AuditResourceApprovalInstance, ID: &instanceID, Key: instanceID, DisplayName: "审批实例 " + instanceID,
|
|
Relation: constants.AuditResourceRelationPrimary, Role: constants.AuditResourceRoleApprovalTarget,
|
|
IdentitySnapshot: map[string]any{
|
|
"id": change.InstanceID, "business_type": change.BusinessType, "business_id": change.BusinessID,
|
|
"submitter_account_id": change.SubmitterAccountID, "provider": change.Provider,
|
|
"external_ref": change.AfterExternalRef, "correlation_id": change.CorrelationID,
|
|
"status": statusValue(change.AfterStatus),
|
|
},
|
|
BeforeData: approvalState(change.BeforeStatus, change.BeforeExternalRef),
|
|
AfterData: approvalState(change.AfterStatus, change.AfterExternalRef),
|
|
}}
|
|
business, err := approvalBusinessResource(ctx, tx, change.BusinessType, change.BusinessID, change.InstanceID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
resources = append(resources, business)
|
|
resources = append(resources, approvalSubmitterResource(change))
|
|
seenIntegrationIDs := make(map[string]struct{}, len(change.IntegrationIDs))
|
|
for _, integrationID := range change.IntegrationIDs {
|
|
integrationID = strings.TrimSpace(integrationID)
|
|
if integrationID == "" {
|
|
continue
|
|
}
|
|
if _, exists := seenIntegrationIDs[integrationID]; exists {
|
|
continue
|
|
}
|
|
seenIntegrationIDs[integrationID] = struct{}{}
|
|
resource, err := approvalIntegrationResource(ctx, tx, integrationID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
resources = append(resources, resource)
|
|
}
|
|
if strings.TrimSpace(change.OutboxEventID) != "" {
|
|
resource, err := approvalOutboxResource(ctx, tx, change.OutboxEventID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
resources = append(resources, resource)
|
|
}
|
|
return resources, nil
|
|
}
|
|
|
|
func approvalBusinessResource(ctx context.Context, tx *gorm.DB, businessType string, businessID, instanceID uint) (ResourceInput, error) {
|
|
id := strconv.FormatUint(uint64(businessID), 10)
|
|
switch businessType {
|
|
case constants.ApprovalBusinessTypeRefund:
|
|
var refund model.RefundRequest
|
|
if err := tx.WithContext(ctx).First(&refund, businessID).Error; err != nil {
|
|
return ResourceInput{}, errors.Wrap(errors.CodeDatabaseError, err, "查询审批关联退款单失败")
|
|
}
|
|
return ResourceInput{
|
|
Type: constants.AuditResourceRefund, ID: &id, Key: refund.RefundNo, DisplayName: refund.RefundNo,
|
|
Relation: constants.AuditResourceRelationReference, Role: constants.AuditResourceRoleApprovalBusiness,
|
|
IdentitySnapshot: map[string]any{
|
|
"id": refund.ID, "refund_no": refund.RefundNo, "order_id": refund.OrderID, "order_no": refund.OrderNo,
|
|
"order_type": refund.OrderType, "asset_identifier": refund.AssetIdentifier, "shop_id": refund.ShopID,
|
|
"requested_refund_amount": refund.RequestedRefundAmount, "actual_received_amount": refund.ActualReceivedAmount,
|
|
"approval_instance_id": instanceID, "status": refund.Status,
|
|
},
|
|
}, nil
|
|
case constants.ApprovalBusinessTypeOfflineRecharge:
|
|
var recharge model.AgentRechargeRecord
|
|
if err := tx.WithContext(ctx).First(&recharge, businessID).Error; err != nil {
|
|
return ResourceInput{}, errors.Wrap(errors.CodeDatabaseError, err, "查询审批关联充值单失败")
|
|
}
|
|
return ResourceInput{
|
|
Type: constants.AuditResourceAgentRecharge, ID: &id, Key: recharge.RechargeNo, DisplayName: recharge.RechargeNo,
|
|
Relation: constants.AuditResourceRelationReference, Role: constants.AuditResourceRoleApprovalBusiness,
|
|
IdentitySnapshot: map[string]any{
|
|
"id": recharge.ID, "recharge_no": recharge.RechargeNo, "user_id": recharge.UserID,
|
|
"shop_id": recharge.ShopID, "agent_wallet_id": recharge.AgentWalletID, "amount": recharge.Amount,
|
|
"payment_method": recharge.PaymentMethod, "payment_channel": recharge.PaymentChannel,
|
|
"approval_instance_id": instanceID, "status": recharge.Status,
|
|
},
|
|
}, nil
|
|
case constants.ApprovalBusinessTypeEmployeeCollection:
|
|
var attempt model.EmployeeCollectionApplicationAttempt
|
|
if err := tx.WithContext(ctx).First(&attempt, businessID).Error; err != nil {
|
|
return ResourceInput{}, errors.Wrap(errors.CodeDatabaseError, err, "查询审批关联核销审批尝试记录失败")
|
|
}
|
|
return ResourceInput{
|
|
Type: constants.AuditResourceEmployeeCollectionAttempt, ID: &id,
|
|
Key: id, DisplayName: "审批尝试 " + id,
|
|
Relation: constants.AuditResourceRelationReference, Role: constants.AuditResourceRoleApprovalBusiness,
|
|
IdentitySnapshot: map[string]any{
|
|
"id": attempt.ID, "application_id": attempt.ApplicationID, "attempt_no": attempt.AttemptNo,
|
|
"paid_amount": attempt.PaidAmount, "approval_instance_id": instanceID,
|
|
},
|
|
}, nil
|
|
case constants.ApprovalBusinessTypeAgentDistribution:
|
|
var registration model.AgentDistributionRegistration
|
|
if err := tx.WithContext(ctx).First(®istration, businessID).Error; err != nil {
|
|
return ResourceInput{}, errors.Wrap(errors.CodeDatabaseError, err, "查询审批关联扫码注册记录失败")
|
|
}
|
|
return ResourceInput{
|
|
Type: constants.AuditResourceAgentDistributionRegistration, ID: &id,
|
|
Key: id, DisplayName: "扫码注册记录 " + id,
|
|
Relation: constants.AuditResourceRelationReference, Role: constants.AuditResourceRoleApprovalBusiness,
|
|
IdentitySnapshot: map[string]any{
|
|
"id": registration.ID, "parent_shop_id": registration.ParentShopID,
|
|
"status": registration.Status, "approval_instance_id": instanceID,
|
|
},
|
|
}, nil
|
|
case constants.ApprovalBusinessTypeWithdrawalQualification:
|
|
var qualification model.WithdrawalQualification
|
|
if err := tx.WithContext(ctx).First(&qualification, businessID).Error; err != nil {
|
|
return ResourceInput{}, errors.Wrap(errors.CodeDatabaseError, err, "查询审批关联提现资料资格版本失败")
|
|
}
|
|
return ResourceInput{
|
|
Type: constants.AuditResourceWithdrawalQualification, ID: &id,
|
|
Key: id, DisplayName: "提现资料资格版本 " + id,
|
|
Relation: constants.AuditResourceRelationReference, Role: constants.AuditResourceRoleApprovalBusiness,
|
|
IdentitySnapshot: map[string]any{
|
|
"id": qualification.ID, "shop_id": qualification.ShopID,
|
|
"subject_type": qualification.SubjectType, "status": qualification.Status,
|
|
"approval_instance_id": instanceID,
|
|
},
|
|
}, nil
|
|
case constants.ApprovalBusinessTypeCommissionWithdrawal:
|
|
var attempt model.CommissionWithdrawalRequestAttempt
|
|
if err := tx.WithContext(ctx).First(&attempt, businessID).Error; err != nil {
|
|
return ResourceInput{}, errors.Wrap(errors.CodeDatabaseError, err, "查询审批关联提现审批尝试记录失败")
|
|
}
|
|
return ResourceInput{
|
|
Type: constants.AuditResourceCommissionWithdrawalAttempt, ID: &id,
|
|
Key: id, DisplayName: "提现审批尝试 " + id,
|
|
Relation: constants.AuditResourceRelationReference, Role: constants.AuditResourceRoleApprovalBusiness,
|
|
IdentitySnapshot: map[string]any{
|
|
"id": attempt.ID, "request_id": attempt.RequestID, "attempt_no": attempt.AttemptNo,
|
|
"amount": attempt.Amount, "approval_instance_id": instanceID,
|
|
},
|
|
}, nil
|
|
default:
|
|
return ResourceInput{}, errors.New(errors.CodeInvalidParam, "审批业务类型尚未注册审计资源")
|
|
}
|
|
}
|
|
|
|
func approvalSubmitterResource(change approvalapp.AuditChange) ResourceInput {
|
|
accountID := strconv.FormatUint(uint64(change.SubmitterAccountID), 10)
|
|
identity := map[string]any{"id": change.SubmitterAccountID}
|
|
var snapshot map[string]any
|
|
if sonic.Unmarshal(change.SubmitterSnapshot, &snapshot) == nil {
|
|
identity["username"] = snapshot["account_name"]
|
|
identity["user_type"] = snapshot["user_type"]
|
|
}
|
|
displayName, _ := identity["username"].(string)
|
|
if displayName == "" {
|
|
displayName = "账号 " + accountID
|
|
}
|
|
return ResourceInput{
|
|
Type: constants.AuditResourceAccount, ID: &accountID, Key: accountID, DisplayName: displayName,
|
|
Relation: constants.AuditResourceRelationReference, Role: constants.AuditResourceRoleApprovalSubmitter,
|
|
IdentitySnapshot: identity,
|
|
}
|
|
}
|
|
|
|
func approvalIntegrationResource(ctx context.Context, tx *gorm.DB, integrationID string) (ResourceInput, error) {
|
|
var record model.IntegrationLog
|
|
if err := tx.WithContext(ctx).Where("integration_id = ?", integrationID).First(&record).Error; err != nil {
|
|
return ResourceInput{}, errors.Wrap(errors.CodeDatabaseError, err, "查询审批关联 Integration Log 失败")
|
|
}
|
|
id := strconv.FormatUint(uint64(record.ID), 10)
|
|
return ResourceInput{
|
|
Type: constants.AuditResourceIntegrationLog, ID: &id, Key: record.IntegrationID, DisplayName: record.IntegrationID,
|
|
Relation: constants.AuditResourceRelationReference, Role: constants.AuditResourceRoleApprovalIntegration,
|
|
IdentitySnapshot: map[string]any{
|
|
"integration_id": record.IntegrationID, "provider": record.Provider, "direction": record.Direction,
|
|
"operation": record.Operation, "external_id": record.ExternalID,
|
|
"resource_type": record.ResourceType, "resource_id": record.ResourceID, "resource_key": record.ResourceKey,
|
|
"correlation_id": record.CorrelationID,
|
|
},
|
|
}, nil
|
|
}
|
|
|
|
func approvalOutboxResource(ctx context.Context, tx *gorm.DB, eventID string) (ResourceInput, error) {
|
|
var event model.OutboxEvent
|
|
if err := tx.WithContext(ctx).Where("event_id = ?", eventID).First(&event).Error; err != nil {
|
|
return ResourceInput{}, errors.Wrap(errors.CodeDatabaseError, err, "查询审批关联 Outbox 事件失败")
|
|
}
|
|
id := strconv.FormatUint(uint64(event.ID), 10)
|
|
return ResourceInput{
|
|
Type: constants.AuditResourceOutboxEvent, ID: &id, Key: event.EventID, DisplayName: event.EventID,
|
|
Relation: constants.AuditResourceRelationReference, Role: constants.AuditResourceRoleApprovalOutbox,
|
|
IdentitySnapshot: map[string]any{
|
|
"event_id": event.EventID, "event_type": event.EventType, "aggregate_type": event.AggregateType,
|
|
"aggregate_id": event.AggregateID, "resource_type": event.ResourceType,
|
|
"resource_id": event.ResourceID, "business_key": event.BusinessKey,
|
|
},
|
|
}, nil
|
|
}
|
|
|
|
func approvalState(status *int, externalRef string) map[string]any {
|
|
if status == nil {
|
|
return nil
|
|
}
|
|
return map[string]any{"status": *status, "external_ref": externalRef}
|
|
}
|
|
|
|
func statusValue(status *int) any {
|
|
if status == nil {
|
|
return nil
|
|
}
|
|
return *status
|
|
}
|