From 4a385da2e63d5c030dab4490c526d2273031821b Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Fri, 24 May 2024 17:52:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=A2=E5=AE=A1?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/LineCalendarsEventMapper.xml | 6 ++---- .../main/java/com/cool/store/config/SignValidateFilter.java | 4 ++-- .../java/com/cool/store/config/TokenValidateFilter.java | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineCalendarsEventMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineCalendarsEventMapper.xml index 89cdcc1b9..ead8b5c53 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineCalendarsEventMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineCalendarsEventMapper.xml @@ -32,13 +32,11 @@ xfsg_line_calendars_event where #{startTime} and start_time < #{endTime}) or (end_time > #{startTime} and end_time < #{endTime}))]]> - and - interview_type = #{interviewType} - and interviewer_user_id = #{interviewerUserId} + and interviewer_user_id = #{interviewerUserId} and interview_type in ('0') - and region_id = #{regionId} + and region_id = #{regionId} and interview_type in ('1', '2') and id != #{excludeInterviewId} diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java index 4b01baecb..d7702cb72 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java @@ -100,7 +100,7 @@ public class SignValidateFilter implements Filter { String method = request.getMethod(); String userStr = ""; boolean isInWhiteList = excludePath(uri); - log.info("url:{}", uri); + log.info("url:{}, method:{}", uri, method); if ( !isInWhiteList && !method.equals("OPTIONS")) { String params = ""; if("GET".equalsIgnoreCase(method)){ @@ -136,7 +136,7 @@ public class SignValidateFilter implements Filter { PartnerUserInfoVO partnerUserInfoVO = wechatMiniAppService.getUserInfo(phone, plaintextOpenid); if(partnerUserInfoVO != null){ userStr = JSONObject.toJSONString(partnerUserInfoVO); - log.info("url:{}, userStr:{}", uri, userStr); + log.info("userStr:{}", userStr); } } try { diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java index a5728ccdc..beaac2820 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java @@ -100,7 +100,7 @@ public class TokenValidateFilter implements Filter { currentUser = JSON.parseObject(userStr, LoginUserInfo.class); } } - log.info("url:{}", uri); + log.info("url:{}, method:{}", uri, method); if ( !isInWhiteList && !method.equals("OPTIONS")) { if (StringUtils.isEmpty(accessToken)) { response.setStatus(HttpStatus.OK.value()); @@ -114,7 +114,7 @@ public class TokenValidateFilter implements Filter { ResponseResult.fail(ErrorCodeEnum.ACCESS_TOKEN_INVALID))); return; } - log.info("url:{}, access_token:{}, userId:{}, username:{}", uri, accessToken, currentUser.getUserId(), currentUser.getName()); + log.info("access_token:{}, userId:{}, username:{}", accessToken, currentUser.getUserId(), currentUser.getName()); } if(StringUtils.isBlank(userStr) && !isInWhiteList){ response.setStatus(HttpStatus.OK.value()); From 18e49783e3c41cb94051d687e12730f9604a0fd8 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Fri, 24 May 2024 19:44:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=9F=AD=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/enums/SMSMsgEnum.java | 4 ++++ .../service/impl/LineInterviewServiceImpl.java | 13 +++++++++++++ 2 files changed, 17 insertions(+) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java index d6b0980fb..bf4b6348c 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java @@ -8,8 +8,10 @@ package com.cool.store.enums; public enum SMSMsgEnum { INTERVIEW_APPOINTMENT_SUCCESS("邀约面谈成功", "", "SMS_465930408"), + INTERVIEW_TIME_MODIFY("面谈时间修改", "", "SMS_467410046"), FIRST_INTERVIEW_APPOINTMENT_SUCCESS("一次面审待预约", "", "SMS_465915456"), FIRST_INTERVIEW_REMIND("一次面审1小时提醒", "", "SMS_465935440"), + FIRST_INTERVIEW_TIME_MODIFY("一审时间修改", "","SMS_467515078"), FIRST_INTERVIEW_REAPPOINTMENT("一次面审重新预约", "", "SMS_465935442"), INTENTION_PAYMENT("意向金待缴费", "", "SMS_465950414"), INTENTION_PAYMENT_FAIL("意向金缴费失败", "", "SMS_465975442"), @@ -19,6 +21,7 @@ public enum SMSMsgEnum { SECOND_INTERVIEW_REMIND("二审前1小时提醒", "", "SMS_465925428"), SECOND_INTERVIEW_REAPPOINTMENT("二审重新预约", "", "SMS_465940421"), SECOND_INTERVIEW_SUCCESS("二审面审成功", "", "SMS_465980397"), + SECOND_INTERVIEW_TIME_MODIFY("二审时间修改", "", "SMS_467365053"), SELECT_SUCCESS("选铺成功", "", "SMS_465950846"), RENT_CONTRACT_AUDIT_FAIL("租赁合同上传未通过", "", "SMS_465955429"), SHOP_EXPERIENCE("门店体验安排", "", "SMS_465905828"), @@ -31,6 +34,7 @@ public enum SMSMsgEnum { THREE_ACCEPTANCE_WAIT("三方验收待验收","","SMS_465961257"), TRAINING_REGISTER_SUCCESS("培训登记中", "", "SMS_466035101"), TRAINING_ASSESSMENT_SUCCESS("员工培训已完成", "", "SMS_465901266"), + ; private String title; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java index 907bddf50..8266bc354 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java @@ -222,6 +222,19 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt updateEvent.setEndTime(endTime); updateEvent.setInterviewDate(startTime); lineCalendarsEventDAO.updateCalendarsEvent(updateEvent); + Map templateParam = new HashMap<>(); + templateParam.put("interviewTime", DateUtils.parseDateToStr(DateUtils.NOTICE_DATE, startTime)); + SMSMsgEnum smsMsgEnum = null; + if(InterviewTypeEnum.MEET.equals(interviewType)){ + smsMsgEnum = SMSMsgEnum.INTERVIEW_TIME_MODIFY; + } + if(InterviewTypeEnum.INTERVIEW.equals(interviewType)){ + smsMsgEnum = SMSMsgEnum.FIRST_INTERVIEW_TIME_MODIFY; + } + if(InterviewTypeEnum.SECOND_INTERVIEW.equals(interviewType)){ + smsMsgEnum = SMSMsgEnum.SECOND_INTERVIEW_TIME_MODIFY; + } + commonService.sendSms(lineInfo.getMobile(), smsMsgEnum, templateParam); return true; }