diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java index 623d47b94..68ec95f71 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java @@ -19,6 +19,7 @@ public enum MessageEnum { MESSAGE_1("您有一份加盟意向申请,请查收。", "##### 加盟商姓名:${partnerUsername}\n##### 手机号码:${partnerMobile}\n##### 意向加盟区域:${wantShopName}\n"), MESSAGE_2("您收到一份邀约面谈预约,请查收", "##### 加盟商姓名:${partnerUsername}\n##### 预约时间:${appointmentTime}\n"), MESSAGE_3("您收到一份一次面审预约,请查收", "##### 加盟商姓名:${partnerUsername}\n##### 预约时间:${appointmentTime}\n"), + MESSAGE_3_1("您的线索已预约一次面审,请关注", "##### 加盟商姓名:${partnerUsername}\n面审官:${interviewUsername}\n##### 预约时间:${appointmentTime}\n"), MESSAGE_4("您有线索未通过面审,请查收", "##### 加盟商姓名:${partnerUsername}\n##### 面审时间:${interviewTime}\n##### 面审官:${interviewUsername}\n"), MESSAGE_5("您收到一份缴纳意向金审核,请查收", "##### 加盟商姓名:${partnerUsername}\n##### 缴费时间:${payTime}\n"), MESSAGE_6("您收到一份加盟意向协议信息审核,请查收", "##### 加盟商姓名:${partnerUsername}\n##### 手机号码:${partnerMobile}\n##### 信息提交时间:${submitTime}\n"), @@ -85,6 +86,7 @@ public enum MessageEnum { switch (this) { case MESSAGE_1: case MESSAGE_2: + case MESSAGE_3_1: case MESSAGE_4: case MESSAGE_5: case MESSAGE_6: 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 0f901c0a4..91c01b98a 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 @@ -157,17 +157,24 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt LineInterviewDO addInterview = LineInterviewDO.convertDO(lineInfo, startTime, endTime, UUIDUtils.get8UUID(), interviewerUserId, interviewType.getCode(), eventId); lineInterviewDAO.addInterviewInfo(addInterview); MessageEnum messageEnum = MessageEnum.MESSAGE_2; + boolean isSendInvestmentManager = Boolean.FALSE; if(InterviewTypeEnum.INTERVIEW.equals(interviewType)){ messageEnum = MessageEnum.MESSAGE_3; + isSendInvestmentManager = Boolean.TRUE; } if(InterviewTypeEnum.SECOND_INTERVIEW.equals(interviewType)){ messageEnum = MessageEnum.MESSAGE_10; + isSendInvestmentManager = Boolean.TRUE; } Map messageMap = new HashMap<>(); messageMap.put("lineId", String.valueOf(lineInfo.getId())); messageMap.put("partnerUsername", lineInfo.getUsername()); messageMap.put("appointmentTime", DateUtils.parseDateToStr(DateUtils.NOTICE_DATE, startTime)); + messageMap.put("interviewUsername", enterpriseUserDAO.getUserName(lineInfo.getInvestmentManager())); commonService.sendMessage(Arrays.asList(interviewerUserId), messageEnum, messageMap); + if(isSendInvestmentManager){ + commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_3_1, messageMap); + } return Boolean.TRUE; }