修复并发,暂时的,不够完整,后续还是需要重新设计,这个太乱了,傻逼AI

internal/task/auto_purchase.go

@@ -271,8 +271,8 @@ func (h *AutoPurchaseHandler) ProcessTask(ctx context.Context, task *asynq.Task)
 				zap.Error(marshalErr))
 		} else {
 			commissionTask := asynq.NewTask(constants.TaskTypeCommission, payloadBytes,
-				asynq.Queue(constants.QueueLow),
 				asynq.MaxRetry(3),
+				asynq.Queue(constants.QueueForTaskType(constants.TaskTypeCommission)),
 			)
 			if _, enqueueErr := h.asynqClient.EnqueueContext(ctx, commissionTask); enqueueErr != nil {
 				h.logger.Warn("自动购包后提交佣金任务失败",
@@ -296,7 +296,7 @@ func NewAutoPurchaseTask(rechargeOrderID uint) (*asynq.Task, error) {
 	return asynq.NewTask(constants.TaskTypeAutoPurchaseAfterRecharge, payloadBytes,
 		asynq.MaxRetry(3),
 		asynq.Timeout(2*time.Minute),
-		asynq.Queue(constants.QueueDefault),
+		asynq.Queue(constants.QueueForTaskType(constants.TaskTypeAutoPurchaseAfterRecharge)),
 	), nil
 }
 

internal/task/export_common.go

@@ -50,6 +50,7 @@ func enqueueTask(ctx context.Context, client *asynq.Client, taskType string, pay
 		return err
 	}
 
+	opts = append(opts, asynq.Queue(constants.QueueForTaskType(taskType)))
 	task := asynq.NewTask(taskType, bytes, opts...)
 	_, err = client.EnqueueContext(ctx, task)
 	return err

internal/task/export_dispatch.go

@@ -215,9 +215,9 @@ func (h *ExportDispatchHandler) enqueueShardTasks(ctx context.Context, task *mod
 			h.asynqClient,
 			constants.TaskTypeExportShard,
 			payload,
-			asynq.Queue(constants.QueueLow),
 			asynq.MaxRetry(constants.ExportShardRetryMax),
 			asynq.Timeout(constants.ExportShardTaskTimeout),
+			asynq.Queue(constants.QueueForTaskType(constants.TaskTypeExportShard)),
 		)
 		if err != nil {
 			h.logger.Error("导出分片任务入队失败",
@@ -237,10 +237,10 @@ func (h *ExportDispatchHandler) enqueueFinalizeTask(ctx context.Context, taskID
 		h.asynqClient,
 		constants.TaskTypeExportFinalize,
 		ExportFinalizePayload{TaskID: taskID},
-		asynq.Queue(constants.QueueDefault),
 		asynq.MaxRetry(constants.ExportFinalizeRetryMax),
 		asynq.Timeout(constants.ExportFinalizeTaskTimeout),
 		asynq.ProcessIn(5*time.Second),
+		asynq.Queue(constants.QueueForTaskType(constants.TaskTypeExportFinalize)),
 	)
 }
 

internal/task/export_shard.go

@@ -175,9 +175,9 @@ func (h *ExportShardHandler) enqueueFinalize(ctx context.Context, taskID uint) e
 		h.asynqClient,
 		constants.TaskTypeExportFinalize,
 		ExportFinalizePayload{TaskID: taskID},
-		asynq.Queue(constants.QueueDefault),
 		asynq.MaxRetry(constants.ExportFinalizeRetryMax),
 		asynq.Timeout(constants.ExportFinalizeTaskTimeout),
 		asynq.ProcessIn(2*time.Second),
+		asynq.Queue(constants.QueueForTaskType(constants.TaskTypeExportFinalize)),
 	)
 }

internal/task/polling_realname_handler.go

@@ -206,7 +206,7 @@ func (h *PollingRealnameHandler) triggerFirstRealnameActivation(ctx context.Cont
 	task := asynq.NewTask(constants.TaskTypePackageFirstActivation, payloadBytes,
 		asynq.MaxRetry(3),
 		asynq.Timeout(30*time.Second),
-		asynq.Queue(constants.QueueDefault),
+		asynq.Queue(constants.QueueForTaskType(constants.TaskTypePackageFirstActivation)),
 	)
 	if _, err := h.asynqClient.EnqueueContext(ctx, task); err != nil {
 		h.base.logger.Warn("提交首次实名激活任务失败", zap.Uint("card_id", cardID), zap.Error(err))
@@ -244,7 +244,7 @@ func (h *PollingRealnameHandler) triggerDeviceRealnameActivation(ctx context.Con
 	task := asynq.NewTask(constants.TaskTypePackageFirstActivation, payloadBytes,
 		asynq.MaxRetry(3),
 		asynq.Timeout(30*time.Second),
-		asynq.Queue(constants.QueueDefault),
+		asynq.Queue(constants.QueueForTaskType(constants.TaskTypePackageFirstActivation)),
 	)
 	if _, err := h.asynqClient.EnqueueContext(ctx, task); err != nil {
 		h.base.logger.Warn("提交设备实名激活任务失败",