From eba6fb512f934ef0407a294c3896fce8f0f0150d Mon Sep 17 00:00:00 2001 From: xupei Date: Tue, 21 Apr 2026 17:02:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E4=BF=AE=E6=94=B9=EF=BC=9Agl?= =?UTF-8?q?obal-award=20=E9=82=AE=E4=BB=B6=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/common/utils/SendEmailUtil.java | 2 +- src/main/java/com/ai/da/controller/AccountController.java | 4 ++-- src/main/java/com/ai/da/service/AccountService.java | 2 +- .../java/com/ai/da/service/impl/AccountServiceImpl.java | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/ai/da/common/utils/SendEmailUtil.java b/src/main/java/com/ai/da/common/utils/SendEmailUtil.java index 160ee4e2..ed9d2b89 100644 --- a/src/main/java/com/ai/da/common/utils/SendEmailUtil.java +++ b/src/main/java/com/ai/da/common/utils/SendEmailUtil.java @@ -1055,7 +1055,7 @@ public class SendEmailUtil { // 根据邮件类型设置不同的主题和模板 String subject = ""; Template template = new Template(); - subject = "From Idea to Wow. \uD83D\uDD25 | AiDA Demo & Global Awards \n灵感开挂，创作起飞 \uD83D\uDD25 | AiDA Demo & 全球设计大奖"; + subject = "AiDA Global Design Awards 2026 | The Journey Starts Now ! \nAiDA 全球设计大奖 2026 | 从现在开始你的创作之旅 !"; template.setTemplateID(EN_GLOBAL_AWARDS); /*if (language.equals("ENGLISH")) { subject = "From Idea to Wow. \uD83D\uDD25 | AiDA Demo & Global Awards"; diff --git a/src/main/java/com/ai/da/controller/AccountController.java b/src/main/java/com/ai/da/controller/AccountController.java index f0dd54be..1a5be3b6 100644 --- a/src/main/java/com/ai/da/controller/AccountController.java +++ b/src/main/java/com/ai/da/controller/AccountController.java @@ -380,12 +380,12 @@ public class AccountController { return Response.success(accountService.subAccountImport(file)); } - /*@GetMapping("/send618Email") + @GetMapping("/send618Email") @Operation(summary = "618邮件发送") public Response send618PromotionEmailTemp() { accountService.send618PromotionEmailTemp(); return Response.success("success"); - }*/ + } /*@GetMapping("/refreshCreditsMonthly") @Operation(summary = "刷新子账号积分") diff --git a/src/main/java/com/ai/da/service/AccountService.java b/src/main/java/com/ai/da/service/AccountService.java index f1654e69..c5aaecad 100644 --- a/src/main/java/com/ai/da/service/AccountService.java +++ b/src/main/java/com/ai/da/service/AccountService.java @@ -239,7 +239,7 @@ public interface AccountService extends IService { Set organizationNameSearch(String type, String name); - /*void send618PromotionEmailTemp();*/ + void send618PromotionEmailTemp(); void checkEduAdminExpireStatus(); diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index 3a659826..aa27fa70 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -3670,13 +3670,13 @@ public class AccountServiceImpl extends ServiceImpl impl return new HashSet<>(); } -/* @Override + @Override public void send618PromotionEmailTemp() { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda() .isNotNull(Account::getUserEmail) -// .in(Account::getUserEmail, "xupei3360@163.com", "kimwong@code-create.com.hk", "kaicpang.pang@connect.polyu.hk", "chelseayu@code-create.com.hk") + .in(Account::getUserEmail, "xupei3360@163.com", "kimwong@code-create.com.hk", "kaicpang.pang@connect.polyu.hk", "chelseayu@code-create.com.hk") .apply("LENGTH(TRIM(user_email)) > 0"); List accounts = baseMapper.selectList(queryWrapper); @@ -3729,7 +3729,7 @@ public class AccountServiceImpl extends ServiceImpl impl } log.info("邮件发送完成，成功：{}，失败：{}", successCount, failCount); - }*/ + } @Override public void checkEduAdminExpireStatus() {