暂存

internal/polling/package_activation_handler.go

@@ -41,6 +41,13 @@ type PackageActivationHandler struct {
 	logger             *zap.Logger
 }
 
+func workerCorrelation(correlationID string, task *asynq.Task) string {
+	if correlationID != "" {
+		return correlationID
+	}
+	return task.ResultWriter().TaskID()
+}
+
 // PackageActivationPayload 套餐激活任务载荷
 type PackageActivationPayload struct {
 	PackageUsageID uint   `json:"package_usage_id"`
@@ -48,6 +55,9 @@ type PackageActivationPayload struct {
 	CarrierID      uint   `json:"carrier_id"`
 	ActivationType string `json:"activation_type"` // "queue" 或 "realname"
 	Timestamp      int64  `json:"timestamp"`
+	RequestID      string `json:"request_id,omitempty"`
+	CorrelationID  string `json:"correlation_id,omitempty"`
+	ParentEventID  string `json:"parent_event_id,omitempty"`
 }
 
 // NewPackageActivationHandler 创建套餐激活检查处理器
@@ -397,10 +407,11 @@ func (h *PackageActivationHandler) triggerStopAfterExpiry(ctx context.Context, c
 	if h.stopResumeCallback == nil {
 		return
 	}
+	detachedCtx := context.WithoutCancel(ctx)
 
 	if carrierType == "iot_card" {
 		go func() {
-			if err := h.stopResumeCallback.CheckAndStopCard(context.Background(), carrierID); err != nil {
+			if err := h.stopResumeCallback.CheckAndStopCard(detachedCtx, carrierID); err != nil {
 				h.logger.Error("套餐过期后停机失败",
 					zap.Uint("card_id", carrierID),
 					zap.Error(err))
@@ -420,7 +431,7 @@ func (h *PackageActivationHandler) triggerStopAfterExpiry(ctx context.Context, c
 		for _, b := range bindings {
 			cardID := b.IotCardID
 			go func(cID uint) {
-				if err := h.stopResumeCallback.CheckAndStopCard(context.Background(), cID); err != nil {
+				if err := h.stopResumeCallback.CheckAndStopCard(detachedCtx, cID); err != nil {
 					h.logger.Error("套餐过期后停机失败",
 						zap.Uint("card_id", cID),
 						zap.Error(err))
@@ -432,12 +443,16 @@ func (h *PackageActivationHandler) triggerStopAfterExpiry(ctx context.Context, c
 
 // enqueueActivationTask 提交套餐激活任务到 Asynq
 func (h *PackageActivationHandler) enqueueActivationTask(ctx context.Context, packageUsageID uint, carrierType string, carrierID uint, activationType string) error {
+	linkage := auditcontext.From(ctx)
 	payload := PackageActivationPayload{
 		PackageUsageID: packageUsageID,
 		CarrierType:    carrierType,
 		CarrierID:      carrierID,
 		ActivationType: activationType,
 		Timestamp:      time.Now().Unix(),
+		RequestID:      linkage.RequestID,
+		CorrelationID:  linkage.CorrelationID,
+		ParentEventID:  linkage.ParentEventID,
 	}
 
 	payloadBytes, err := sonic.Marshal(payload)
@@ -477,6 +492,7 @@ func (h *PackageActivationHandler) HandlePackageQueueActivation(ctx context.Cont
 	ctx = auditcontext.With(ctx, auditcontext.Context{
 		ActorKind: constants.AuditActorSystemTask, ActorID: constants.TaskTypePackageQueueActivation,
 		ActorName: "套餐排队激活任务", Source: constants.AuditSourceWorker,
+		RequestID: payload.RequestID, CorrelationID: workerCorrelation(payload.CorrelationID, t), ParentEventID: payload.ParentEventID,
 	})
 
 	h.logger.Info("开始执行套餐激活",
@@ -534,6 +550,7 @@ func (h *PackageActivationHandler) HandlePackageFirstActivation(ctx context.Cont
 	ctx = auditcontext.With(ctx, auditcontext.Context{
 		ActorKind: constants.AuditActorSystemTask, ActorID: constants.TaskTypePackageFirstActivation,
 		ActorName: "套餐首次实名激活任务", Source: constants.AuditSourceWorker,
+		RequestID: payload.RequestID, CorrelationID: workerCorrelation(payload.CorrelationID, t), ParentEventID: payload.ParentEventID,
 	})
 
 	if payload.CarrierType == "" || payload.CarrierID == 0 {