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

internal/service/device_import/service.go

@@ -13,6 +13,7 @@ import (
 	"github.com/break/junhong_cmp_fiber/pkg/errors"
 	"github.com/break/junhong_cmp_fiber/pkg/middleware"
 	"github.com/break/junhong_cmp_fiber/pkg/queue"
+	"github.com/hibiken/asynq"
 	"gorm.io/gorm"
 )
 
@@ -70,7 +71,12 @@ func (s *Service) CreateImportTask(ctx context.Context, req *dto.ImportDeviceReq
 	}
 
 	payload := DeviceImportPayload{TaskID: task.ID}
-	err := s.queueClient.EnqueueTask(ctx, constants.TaskTypeDeviceImport, payload)
+	err := s.queueClient.EnqueueTask(
+		ctx,
+		constants.TaskTypeDeviceImport,
+		payload,
+		asynq.Queue(constants.QueueForTaskType(constants.TaskTypeDeviceImport)),
+	)
 	if err != nil {
 		s.importTaskStore.UpdateStatus(ctx, task.ID, model.ImportTaskStatusFailed, "任务入队失败: "+err.Error())
 		appErr := errors.Wrap(errors.CodeInternalError, err, "任务入队失败")

internal/service/email/service.go

@@ -10,7 +10,6 @@ import (
 	"github.com/break/junhong_cmp_fiber/pkg/constants"
 	"github.com/break/junhong_cmp_fiber/pkg/errors"
 	"github.com/break/junhong_cmp_fiber/pkg/queue"
-	"github.com/bytedance/sonic"
 	"github.com/hibiken/asynq"
 	"go.uber.org/zap"
 )
@@ -39,21 +38,12 @@ func (s *Service) SendWelcomeEmail(ctx context.Context, userID uint, email strin
 		Body:      "感谢您注册我们的服务！我们很高兴为您提供服务。",
 	}
 
-	payloadBytes, err := sonic.Marshal(payload)
-	if err != nil {
-		s.logger.Error("序列化邮件任务载荷失败",
-			zap.Uint("user_id", userID),
-			zap.String("email", email),
-			zap.Error(err))
-		return errors.Wrap(errors.CodeInternalError, err, "序列化邮件任务载荷失败")
-	}
-
 	// 提交任务到队列
-	err = s.queueClient.EnqueueTask(
+	err := s.queueClient.EnqueueTask(
 		ctx,
 		constants.TaskTypeEmailSend,
-		payloadBytes,
-		asynq.Queue(constants.QueueDefault),
+		payload,
+		asynq.Queue(constants.QueueForTaskType(constants.TaskTypeEmailSend)),
 		asynq.MaxRetry(constants.DefaultRetryMax),
 	)
 
@@ -82,20 +72,12 @@ func (s *Service) SendPasswordResetEmail(ctx context.Context, email string, rese
 		Body:      fmt.Sprintf("您的密码重置令牌是: %s\n此令牌将在 1 小时后过期。", resetToken),
 	}
 
-	payloadBytes, err := sonic.Marshal(payload)
-	if err != nil {
-		s.logger.Error("序列化密码重置邮件任务载荷失败",
-			zap.String("email", email),
-			zap.Error(err))
-		return errors.Wrap(errors.CodeInternalError, err, "序列化密码重置邮件任务载荷失败")
-	}
-
-	// 提交任务到队列（高优先级）
-	err = s.queueClient.EnqueueTask(
+	// 提交任务到独立邮件队列
+	err := s.queueClient.EnqueueTask(
 		ctx,
 		constants.TaskTypeEmailSend,
-		payloadBytes,
-		asynq.Queue(constants.QueueCritical), // 密码重置使用高优先级队列
+		payload,
+		asynq.Queue(constants.QueueForTaskType(constants.TaskTypeEmailSend)),
 		asynq.MaxRetry(constants.DefaultRetryMax),
 	)
 
@@ -122,20 +104,12 @@ func (s *Service) SendNotificationEmail(ctx context.Context, to string, subject
 		Body:      body,
 	}
 
-	payloadBytes, err := sonic.Marshal(payload)
-	if err != nil {
-		s.logger.Error("序列化通知邮件任务载荷失败",
-			zap.String("to", to),
-			zap.Error(err))
-		return errors.Wrap(errors.CodeInternalError, err, "序列化通知邮件任务载荷失败")
-	}
-
-	// 提交任务到队列（低优先级）
-	err = s.queueClient.EnqueueTask(
+	// 提交任务到独立邮件队列
+	err := s.queueClient.EnqueueTask(
 		ctx,
 		constants.TaskTypeEmailSend,
-		payloadBytes,
-		asynq.Queue(constants.QueueLow), // 通知邮件使用低优先级队列
+		payload,
+		asynq.Queue(constants.QueueForTaskType(constants.TaskTypeEmailSend)),
 		asynq.MaxRetry(constants.DefaultRetryMax),
 	)
 

internal/service/export_task/service.go

@@ -126,9 +126,9 @@ func (s *Service) CreateTask(ctx context.Context, req *dto.CreateExportTaskReque
 		ctx,
 		constants.TaskTypeExportDispatch,
 		dispatchPayload{TaskID: task.ID},
-		asynq.Queue(constants.QueueDefault),
 		asynq.MaxRetry(constants.ExportDispatchRetryMax),
 		asynq.Timeout(constants.ExportDispatchTaskTimeout),
+		asynq.Queue(constants.QueueForTaskType(constants.TaskTypeExportDispatch)),
 	); err != nil {
 		_ = s.taskStore.MarkFailed(ctx, task.ID, userID, "导出任务入队失败")
 		return nil, errors.Wrap(errors.CodeTaskQueueError, err, "导出任务入队失败")

internal/service/iot_card_import/service.go

@@ -13,6 +13,7 @@ import (
 	"github.com/break/junhong_cmp_fiber/pkg/errors"
 	"github.com/break/junhong_cmp_fiber/pkg/middleware"
 	"github.com/break/junhong_cmp_fiber/pkg/queue"
+	"github.com/hibiken/asynq"
 	"gorm.io/gorm"
 )
 
@@ -108,7 +109,12 @@ func (s *Service) CreateImportTask(ctx context.Context, req *dto.ImportIotCardRe
 	}
 
 	payload := IotCardImportPayload{TaskID: task.ID}
-	err = s.queueClient.EnqueueTask(ctx, constants.TaskTypeIotCardImport, payload)
+	err = s.queueClient.EnqueueTask(
+		ctx,
+		constants.TaskTypeIotCardImport,
+		payload,
+		asynq.Queue(constants.QueueForTaskType(constants.TaskTypeIotCardImport)),
+	)
 	if err != nil {
 		s.importTaskStore.UpdateStatus(ctx, task.ID, model.ImportTaskStatusFailed, "任务入队失败: "+err.Error())
 		appErr := errors.Wrap(errors.CodeInternalError, err, "任务入队失败")

internal/service/recharge_order/service.go

@@ -169,8 +169,8 @@ func (s *Service) HandlePaymentCallback(ctx context.Context, paymentNo string, p
 	if len(linkedIDs) > 0 {
 		taskPayload := task.AutoPurchasePayload{RechargeOrderID: rechargeOrder.ID}
 		if err := s.queueClient.EnqueueTask(ctx, constants.TaskTypeAutoPurchaseAfterRecharge, taskPayload,
-			asynq.Queue(constants.QueueDefault),
 			asynq.MaxRetry(3),
+			asynq.Queue(constants.QueueForTaskType(constants.TaskTypeAutoPurchaseAfterRecharge)),
 		); err != nil {
 			s.logger.Error("自动购包任务入队失败",
 				zap.Uint("recharge_order_id", rechargeOrder.ID),