注销

queue/logic/email/sendEmailLogic.go

@@ -60,14 +60,6 @@ func (l *SendEmailLogic) ProcessTask(ctx context.Context, task *asynq.Task) erro
 		scene := resolveVerifyScene(payload.Scene, typeVal)
 		tplStr := selectVerifyTemplate(l.svcCtx.Config.Email.VerifyEmailTemplates, l.svcCtx.Config.Email.VerifyEmailTemplate, scene)
 
-		if tplStr == l.svcCtx.Config.Email.VerifyEmailTemplate &&
-			scene == constant.DeleteAccount.String() &&
-			!strings.Contains(tplStr, "Type 4") &&
-			!strings.Contains(tplStr, "Type eq 4") {
-			logger.WithContext(ctx).Infow("[SendEmailLogic] configured legacy verify template may not support DeleteAccount, fallback to default template")
-			tplStr = email.DefaultEmailVerifyTemplate
-		}
-
 		tpl, _ := template.New("verify").Parse(tplStr)
 		var result bytes.Buffer
 
@@ -80,6 +72,23 @@ func (l *SendEmailLogic) ProcessTask(ctx context.Context, task *asynq.Task) erro
 			return nil
 		}
 		content = result.String()
+	case types.EmailTypeDeleteAccount:
+		tplStr := l.svcCtx.Config.Email.DeleteAccountEmailTemplate
+		if tplStr == "" {
+			tplStr = email.DefaultDeleteAccountEmailTemplate
+		}
+		tpl, _ := template.New("delete_account").Parse(tplStr)
+		var result bytes.Buffer
+		err = tpl.Execute(&result, payload.Content)
+		if err != nil {
+			logger.WithContext(ctx).Error("[SendEmailLogic] Execute template failed",
+				logger.Field("error", err.Error()),
+				logger.Field("template", l.svcCtx.Config.Email.DeleteAccountEmailTemplate),
+				logger.Field("data", payload.Content),
+			)
+			return nil
+		}
+		content = result.String()
 	case types.EmailTypeMaintenance:
 		tplStr := l.svcCtx.Config.Email.MaintenanceEmailTemplate
 		if tplStr == "" {

queue/types/email.go

@@ -10,6 +10,7 @@ const (
 	EmailTypeMaintenance   = "maintenance"
 	EmailTypeExpiration    = "expiration"
 	EmailTypeTrafficExceed = "traffic_exceed"
+	EmailTypeDeleteAccount = "delete_account"
 	EmailTypeCustom        = "custom"
 )