diff --git a/src/main/java/com/ai/da/common/config/MyTaskScheduler.java b/src/main/java/com/ai/da/common/config/MyTaskScheduler.java index f4837542..86d82fd4 100644 --- a/src/main/java/com/ai/da/common/config/MyTaskScheduler.java +++ b/src/main/java/com/ai/da/common/config/MyTaskScheduler.java @@ -91,6 +91,7 @@ public class MyTaskScheduler { public void sendTrialOrderExcelToManagements() { // 获取前一天日期 LocalDate yesterday = LocalDate.now().minusDays(1); +// LocalDate before = LocalDate.now().minusDays(4); // 查询前一天的试用订单 QueryWrapper qw = new QueryWrapper<>(); @@ -130,7 +131,7 @@ public class MyTaskScheduler { row.createCell(6).setCellValue(trialOrder.getCountry()); row.createCell(7).setCellValue(trialOrder.getOccupation()); row.createCell(8).setCellValue(trialOrder.getCreateTime().format(formatter)); - if (ObjectUtils.isEmpty(trialOrder.getUpdateTime())) { + if (!ObjectUtils.isEmpty(trialOrder.getUpdateTime())) { row.createCell(9).setCellValue(trialOrder.getUpdateTime().format(formatter)); } row.createCell(10).setCellValue(trialOrder.getStatus()); 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 3fa750e2..8c0db85e 100644 --- a/src/main/java/com/ai/da/common/utils/SendEmailUtil.java +++ b/src/main/java/com/ai/da/common/utils/SendEmailUtil.java @@ -404,10 +404,10 @@ public class SendEmailUtil { // template.setTemplateID(UPGRADE_NOTIFICATION_ID_CHINESE); // } if (type == 1) { - subject = "Successful System Upgrade and New Features in AiDA 3.1"; + subject = "Successful System Upgrade and New Features in AiDA 3.0"; template.setTemplateID(UPGRADE_SUCCESS_NOTIFICATION_ID); }else { - subject = "系统升级成功和AiDA 3.1新功能"; + subject = "系统升级成功和AiDA 3.0新功能"; template.setTemplateID(UPGRADE_SUCCESS_NOTIFICATION_ID_CHINESE); } template.setTemplateData(buildAccountData(account)); @@ -417,8 +417,10 @@ public class SendEmailUtil { // 发送邮件 SendEmailResponse resp = client.SendEmail(req); + log.info(senderAddress); log.info("短信发送结果res###{}", SendEmailResponse.toJsonString(resp)); } catch (TencentCloudSDKException e) { + log.info(senderAddress); log.info("邮件发送失败###{}", e.toString()); throw new BusinessException("failed.to.send.mail"); } 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 a8633faf..89b6db05 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -491,6 +491,19 @@ public class AccountServiceImpl extends ServiceImpl impl account.setCountry(emailSendDTO.getCountry()); account.setOccupation(emailSendDTO.getOccupation()); baseMapper.updateById(account); + + String userEmail = account.getUserEmail(); + QueryWrapper trialOrderQueryWrapper = new QueryWrapper<>(); + trialOrderQueryWrapper.lambda().eq(TrialOrder::getEmail, userEmail); + List trialOrders = trialOrderMapper.selectList(trialOrderQueryWrapper); + if (CollectionUtil.isNotEmpty(trialOrders)) { + for (TrialOrder trialOrder : trialOrders) { + trialOrder.setCountry(emailSendDTO.getCountry()); + trialOrder.setOccupation(emailSendDTO.getOccupation()); + trialOrderMapper.updateById(trialOrder); + } + } + result = true; } break;