From 9efd9626948e1e5c3261ff0ba556c7f86480490d Mon Sep 17 00:00:00 2001 From: "feng.li" Date: Sat, 7 Oct 2023 11:44:30 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A630=E5=88=86=E9=92=9F=E4=B9=8B?= =?UTF-8?q?=E5=86=85=E7=9A=84=E9=9D=A2=E8=AF=95=E4=B8=8D=E5=8F=91=E9=80=81?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E7=9F=AD=E4=BF=A1Bug=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/HyPartnerInterviewPlanMapper.xml | 4 +++- .../service/impl/HyPartnerInterviewPlanServiceImpl.java | 6 +++--- .../test/java/com/cool/store/service/SmsServiceTest.java | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml index bb6b56c51..f60e0e3ec 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml @@ -563,8 +563,10 @@ LEFT JOIN hy_partner_user_info t3 ON t1.partner_id = t3.partner_id WHERE t1.deleted = 0 ANd t2.deleted = 0 AND t2.`status` = 2 + -- 开始时间在 now 和 now + 30 以内的（即下一场面试的） AND start_time > NOW() AND start_time <= DATE_ADD(NOW(), INTERVAL 30 MINUTE) - AND t1.update_time <= DATE_SUB(NOW(), INTERVAL 30 MINUTE) + -- 更新时间（同意面试预约时间）在当前时间之前的（即在面试开始 30 分钟之前同意预约的） + AND t1.update_time >= NOW() \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java index 2054734c6..488eb4281 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java @@ -374,9 +374,9 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan //每半小时执行一次，查询有无面试时间 x 在当前时间 y < x <= y + 30m 内，有就发短信 @Override public void remindInterviewStartMinutes() { - List tomorrowInterviewInfos = hyPartnerInterviewPlanMapper.remindInterviewStartMinutes(); - for (HyInterviewRemindDO tomorrowInterviewInfo : tomorrowInterviewInfos) { - smsService.sendSmsVariable(tomorrowInterviewInfo.getMobile(), SMSMsgEnum.INTERVIEW_BEGIN_IN_MINUTES, wechatMiniAppService.getMiniAppUrl()); + List minutesInterviewInfos = hyPartnerInterviewPlanMapper.remindInterviewStartMinutes(); + for (HyInterviewRemindDO minutesInterviewInfo : minutesInterviewInfos) { + smsService.sendSmsVariable(minutesInterviewInfo.getMobile(), SMSMsgEnum.INTERVIEW_BEGIN_IN_MINUTES, wechatMiniAppService.getMiniAppUrl()); } } diff --git a/coolstore-partner-service/src/test/java/com/cool/store/service/SmsServiceTest.java b/coolstore-partner-service/src/test/java/com/cool/store/service/SmsServiceTest.java index a34d01d75..1ec152a99 100644 --- a/coolstore-partner-service/src/test/java/com/cool/store/service/SmsServiceTest.java +++ b/coolstore-partner-service/src/test/java/com/cool/store/service/SmsServiceTest.java @@ -7,7 +7,8 @@ import org.junit.jupiter.api.Test; * @Author: young.yu * @Date: 2023-09-14 15:22 * @Description: - */class SmsServiceTest { + */ +class SmsServiceTest { @Test void sendSmsNormal() {