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 967d7961d..798bea620 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 @@ -195,13 +195,13 @@ public enum MessageEnum { return null; } - public String getQWMessageUrl(String qywxUrl2, String corpId, Map paramMap,String target) { + public String getQWMessageUrl(String qywxUrl2, String corpId, Map paramMap,String target,String eid) { if (StringUtils.isAnyBlank(qywxUrl2, corpId) ) { return ""; } String messageUrl = null; try { - String noticeUrl = String.format(qywxUrl2, corpId,"qw_self_dkf",target,corpId,"qw"); + String noticeUrl = String.format(qywxUrl2, corpId,"qw_self_dkf",target,corpId,"qw",eid); String finalUrl = buildUrlWithParams(noticeUrl, paramMap); log.info("finalUrl:{}", finalUrl); messageUrl = URLEncoder.encode(finalUrl, "UTF-8"); 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 e8556539f..421f396b0 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 @@ -198,7 +198,7 @@ public class CommonService { } try { // String pcMessageUrl = message.getQWMessageUrl(qywxUrl1, dingCorpId, requestMap); - String messageUrl = message.getQWMessageUrl(qywxUrl2, dingCorpId, requestMap,"todo"); + String messageUrl = message.getQWMessageUrl(qywxUrl2, dingCorpId, requestMap,"todo",enterpriseId); log.info("messageUrl:{}", messageUrl); if(StringUtils.isBlank(messageUrl)){ log.info("获取通知url为空"); diff --git a/coolstore-partner-web/src/main/resources/application-test.properties b/coolstore-partner-web/src/main/resources/application-test.properties index 41bae34d3..165cbf8a5 100644 --- a/coolstore-partner-web/src/main/resources/application-test.properties +++ b/coolstore-partner-web/src/main/resources/application-test.properties @@ -81,4 +81,4 @@ mybatis.configuration.variables.enterpriseId=5558ce7a3aa84e3590392fcaa8697ffb enterprise.dingCorpId=wpayJeDAAAhGIFgUJpJN-zg39JuNbYhg ##qywx.task.notice.url1=https://tstore-api.coolstore.cn/notice?corpId=%s&appType=%s&target=%s -qywx.task.notice.url2=https://tstore-h5.coolstore.cn/?corpId=%s&appType=%s#/notice?target=%s¬iceType=zx&corpId=%s&appType=%s +qywx.task.notice.url2=https://tstore-h5.coolstore.cn/?corpId=%s&appType=%s#/notice?target=%s¬iceType=zx&corpId=%s&appType=%s&eid=%s