From 62545218fac79bbd53eb748be1b88f60c03c150c Mon Sep 17 00:00:00 2001 From: guohb Date: Sat, 11 May 2024 11:33:04 +0800 Subject: [PATCH] message --- .../src/main/java/com/cool/store/enums/MessageEnum.java | 9 +++++---- .../java/com/cool/store/service/impl/CommonService.java | 9 +++++++++ .../store/service/impl/LineInterviewServiceImpl.java | 7 +++++++ 3 files changed, 21 insertions(+), 4 deletions(-) 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 d898e0db9..fa19f2fa8 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 @@ -108,11 +108,12 @@ public enum MessageEnum { case MESSAGE_19: case MESSAGE_20: case MESSAGE_23: - return "dingtalk://dingtalkclient/action/open_micro_app?appId="+appId+"&corpId="+corpId+"&page=" + - URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=franchiseeDetails×tamp="+System.currentTimeMillis()+"&lineId="+ paramMap.get("lineId"), StandardCharsets.UTF_8.name()); + //跳转我的加盟商的加盟商详情都可以使用这个 + 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()); case MESSAGE_17: - return "dingtalk://dingtalkclient/action/open_micro_app?appId="+appId+"&corpId="+corpId+"&page=" + - URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=license×tamp="+System.currentTimeMillis()+"&shopId="+ paramMap.get("shopId"), StandardCharsets.UTF_8.name()); + return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId=" + corpId + "&appUrl=" + + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=license×tamp=" + System.currentTimeMillis() + "&shopId=" + paramMap.get("shopId"), StandardCharsets.UTF_8.name()); case MESSAGE_21: return domainUrl + "/dd-noticemsg?appId="+appId+"&corpId="+corpId+"&page=" + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=employeeTraining×tamp="+System.currentTimeMillis()+"&userDetailId="+ paramMap.get("userDetailId"), StandardCharsets.UTF_8.name()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java index d9aa71a83..bdb66ec1e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java @@ -31,6 +31,7 @@ import java.text.MessageFormat; import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; import java.util.stream.Collectors; /** @@ -75,6 +76,10 @@ public class CommonService { return (AuditResultService) applicationContext.getBean(auditEnum.getClazz()); } + public void sendMessageAsync(List userIds, MessageEnum message, Map requestMap){ + CompletableFuture.runAsync(() -> sendMessage(userIds, message, requestMap)); + } + public void sendMessage(List userIds, MessageEnum message, Map requestMap){ if(CollectionUtils.isEmpty(userIds)){ return; @@ -120,6 +125,10 @@ public class CommonService { sendSms(Arrays.asList(poneNumber), templateCode, templateParamMap); } + public void sendSmsAsync(String poneNumber, SMSMsgEnum templateCode, Map templateParamMap){ + CompletableFuture.runAsync(() -> sendSms(Arrays.asList(poneNumber), templateCode, templateParamMap)); + } + public void sendSms(List poneNumbers, SMSMsgEnum templateCode, Map templateParamMap){ List signNameList = new ArrayList<>(); signNameList.add("酷店掌"); 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 794199eb7..0f901c0a4 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 @@ -448,6 +448,13 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt auditStatusService.insert(lineInfo.getId(),interviewInfo.getId(),auditId,AuditStageEnum.TWO.getCode()); //发送短信 commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.SECOND_INTERVIEW_SUCCESS, null); + Map requestMap = new HashMap<>(); + //todo 建店还未开始时 + requestMap.put("storeName","XXX"); + requestMap.put("partnerName",lineInfo.getUsername()); + requestMap.put("partnerMobile",lineInfo.getMobile()); + requestMap.put("lineId",String.valueOf(lineInfo.getId())); + commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_23,requestMap); } return lineInterviewDAO.updateInterviewInfo(updateInterviewInfo) > 0; }