暂存

internal/task/auto_purchase.go

@@ -27,7 +27,10 @@ import (
 
 // AutoPurchasePayload 充值后自动购包任务载荷
 type AutoPurchasePayload struct {
-	RechargeOrderID uint `json:"recharge_order_id"`
+	RechargeOrderID uint   `json:"recharge_order_id"`
+	RequestID       string `json:"request_id,omitempty"`
+	CorrelationID   string `json:"correlation_id,omitempty"`
+	ParentEventID   string `json:"parent_event_id,omitempty"`
 }
 
 // AutoPurchaseHandler 充值后自动购包任务处理器
@@ -123,10 +126,14 @@ func (h *AutoPurchaseHandler) ProcessTask(ctx context.Context, task *asynq.Task)
 		h.logger.Error("查询充值订单失败", zap.Uint("recharge_order_id", payload.RechargeOrderID), zap.Error(err))
 		return err
 	}
+	correlationID := payload.CorrelationID
+	if correlationID == "" {
+		correlationID = rechargeOrder.RechargeOrderNo
+	}
 	ctx = auditcontext.With(ctx, auditcontext.Context{
 		ActorKind: constants.AuditActorSystemTask, ActorID: constants.TaskTypeAutoPurchaseAfterRecharge,
 		ActorName: "充值后自动购包任务", Source: constants.AuditSourceWorker,
-		CorrelationID: rechargeOrder.RechargeOrderNo,
+		RequestID: payload.RequestID, CorrelationID: correlationID, ParentEventID: payload.ParentEventID,
 	})
 
 	if rechargeOrder.AutoPurchaseStatus == constants.AutoPurchaseStatusSuccess {
@@ -301,7 +308,11 @@ func (h *AutoPurchaseHandler) ProcessTask(ctx context.Context, task *asynq.Task)
 
 	// 事务提交成功后触发佣金计算（不在事务内，防止任务提交后事务回滚的数据一致性问题）
 	if h.asynqClient != nil && createdOrderID > 0 {
-		payloadBytes, marshalErr := sonic.Marshal(map[string]any{"order_id": createdOrderID})
+		linkage := auditcontext.From(ctx)
+		payloadBytes, marshalErr := sonic.Marshal(CommissionCalculationPayload{
+			OrderID: createdOrderID, RequestID: linkage.RequestID,
+			CorrelationID: linkage.CorrelationID, ParentEventID: linkage.ParentEventID,
+		})
 		if marshalErr != nil {
 			h.logger.Warn("佣金任务载荷序列化失败",
 				zap.Uint("order_id", createdOrderID),