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 a03aff550..a2b010b13 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 @@ -27,6 +27,7 @@ public enum MessageEnum { MESSAGE_8("您有一位加盟商待安排体验门店及体验时间,请查收", "##### 加盟商姓名:${partnerUsername}\n##### 手机号码:${partnerMobile}\n"), MESSAGE_9("您有一位加盟商已放弃门店体验,请查收", "##### 加盟商姓名:${partnerUsername}\n##### 手机号码:${partnerMobile}\n"), MESSAGE_10("您收到一份二次面审预约,请查收", "##### 加盟商姓名:${partnerUsername}\n##### 预约时间:${appointmentTime}\n"), + MESSAGE_10_1("您的线索已预约二次面审,请关注", "##### 加盟商姓名:${partnerUsername}\n面审官:${interviewUsername}\n##### 预约时间:${appointmentTime}\n"), MESSAGE_11("您的一个铺位已审核通过,请查收", "##### 铺位名称:${pointName}\n##### 铺位地址:${pointAddress}\n"), MESSAGE_12("您的一个铺位审核未通过,请查收", "##### 铺位名称:${pointName}\n##### 铺位地址:${pointAddress}\n##### 未通过原因:${reason}\n"), MESSAGE_13("您有一个铺位需要审核,请查收", "##### 铺位名称:${pointName}\n##### 铺位地址:${pointAddress}\n"), @@ -108,13 +109,14 @@ public enum MessageEnum { URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=point×tamp=" + System.currentTimeMillis() + "&pointId=" + paramMap.get("pointId"), StandardCharsets.UTF_8.name()); case MESSAGE_14: return "dingtalk://dingtalkclient/action/open_micro_app?appId=" + appId + "&corpId=" + corpId + "&page=" + - URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=pointPush×tamp=" + System.currentTimeMillis() + "&lineId=" + paramMap.get("lineId"), StandardCharsets.UTF_8.name()); + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=franchiseeDetails×tamp=" + System.currentTimeMillis() + "&lineId=" + paramMap.get("lineId"), StandardCharsets.UTF_8.name()); case MESSAGE_15: case MESSAGE_16: case MESSAGE_18: case MESSAGE_19: case MESSAGE_20: case MESSAGE_23: + case MESSAGE_10_1: //跳转我的加盟商的加盟商详情都可以使用这个 return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId=" + corpId + "&appUrl=" + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=franchiseeDetails×tamp=" + System.currentTimeMillis() + "&lineId=" + paramMap.get("lineId"), StandardCharsets.UTF_8.name()); 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 91c01b98a..9c6e4f1ee 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,14 +157,14 @@ 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; + MessageEnum investmentManagerMessageEnum = null; if(InterviewTypeEnum.INTERVIEW.equals(interviewType)){ messageEnum = MessageEnum.MESSAGE_3; - isSendInvestmentManager = Boolean.TRUE; + investmentManagerMessageEnum = MessageEnum.MESSAGE_3_1; } if(InterviewTypeEnum.SECOND_INTERVIEW.equals(interviewType)){ messageEnum = MessageEnum.MESSAGE_10; - isSendInvestmentManager = Boolean.TRUE; + investmentManagerMessageEnum = MessageEnum.MESSAGE_10_1; } Map messageMap = new HashMap<>(); messageMap.put("lineId", String.valueOf(lineInfo.getId())); @@ -172,8 +172,8 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt 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); + if(Objects.nonNull(investmentManagerMessageEnum)){ + commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()), investmentManagerMessageEnum, messageMap); } return Boolean.TRUE; }