TASK:订阅到期通知或续订通知(暂时关闭邮件发送)

This commit is contained in:
2025-12-03 13:55:52 +08:00
parent fc0867d9b1
commit bd69793a72
3 changed files with 34 additions and 20 deletions

View File

@@ -21,6 +21,7 @@ import org.springframework.util.StringUtils;
import java.util.Base64;
import java.util.Date;
import java.util.Objects;
/**
* 邮件发送类
@@ -832,7 +833,7 @@ public class SendEmailUtil {
if (language.equals("ENGLISH")) {
user.setSubject("[Code-Create] AiDA Subscription Renewal Reminder");
templateUser.setTemplateID(156072L);
} else if (language.equals("CHINESE")){
} else if (language.equals("CHINESE_SIMPLIFIED")){
user.setSubject("[Code-Create] AiDA续订提醒");
templateUser.setTemplateID(156073L);
} else {
@@ -844,7 +845,7 @@ public class SendEmailUtil {
if (language.equals("ENGLISH")) {
user.setSubject("[Code-Create] AiDA account is about to expire");
templateUser.setTemplateID(156749L);
} else if (language.equals("CHINESE")){
} else if (language.equals("CHINESE_SIMPLIFIED")){
user.setSubject("[Code-Create] 您的AiDA账号即将到期");
templateUser.setTemplateID(156750L);
} else {
@@ -856,7 +857,7 @@ public class SendEmailUtil {
if (language.equals("ENGLISH")) {
user.setSubject("[Code-Create] AiDA — Free Trial Ending");
templateUser.setTemplateID(156075L);
} else if (language.equals("CHINESE")){
} else if (language.equals("CHINESE_SIMPLIFIED")){
user.setSubject("[Code-Create] AiDA — 免费试用结束提醒");
templateUser.setTemplateID(156076L);
} else {
@@ -874,14 +875,16 @@ public class SendEmailUtil {
templateUser.setTemplateData(JSON.toJSONString(subscriptionEmailParamsDTO));
user.setTemplate(templateUser);
subscriptionEmailParamsDTO.setEndDate("When cancelled");
if (Objects.nonNull(subscriptionEmailParamsDTO)) {
subscriptionEmailParamsDTO.setEndDate("When cancelled");
}
templateMerchant.setTemplateData(JSON.toJSONString(subscriptionEmailParamsDTO));
merchant.setTemplate(templateMerchant);
if (!type.equals("cancel") && !type.equals("fail_new")) {
// 返回的resp是一个SendEmailResponse的实例与请求对象对应
SendEmailResponse respUser = client.SendEmail(user);
log.info("邮件主题:{}发送结果toUser###{}", user.getSubject(), SendEmailResponse.toJsonString(respUser));
// SendEmailResponse respUser = client.SendEmail(user);
log.info("邮件主题:{}发送结果toUser###{}, email:{}", user.getSubject(), /*SendEmailResponse.toJsonString(respUser)*/null, receiverAddress);
}
if (!type.startsWith("reminder")) {
SendEmailResponse respMerchant = client.SendEmail(merchant);