通知更改

coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java

@@ -1,5 +1,13 @@
 package com.cool.store.enums;
 
+import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.Objects;
+
 /**
  * @author zhangchenbiao
  * @FileName: MessageEnum
@@ -8,21 +16,21 @@ package com.cool.store.enums;
  */
 public enum MessageEnum {
 
-    MESSAGE_1("您有一份加盟意向申请，请查收。", "##### 加盟商姓名：{0}\n##### 手机号码：{1}\n##### 意向加盟区域：{2}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
+    MESSAGE_1("您有一份加盟意向申请，请查收。", "##### 加盟商姓名：{partnerUsername}\n##### 手机号码：{partnerMobile}\n##### 意向加盟区域：{wantShopName}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
-    MESSAGE_2("您收到一份邀约面谈预约，请查收", "##### 加盟商姓名：{0}\n##### 预约时间：{1}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
+    MESSAGE_2("您收到一份邀约面谈预约，请查收", "##### 加盟商姓名：{partnerUsername}\n##### 预约时间：{appointmentTime}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
-    MESSAGE_3("您收到一份一次面审预约，请查收", "##### 加盟商姓名：{0}\n##### 预约时间：{1}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
+    MESSAGE_3("您收到一份一次面审预约，请查收", "##### 加盟商姓名：{partnerUsername}\n##### 预约时间：{appointmentTime}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
-    MESSAGE_4("您有线索未通过面审，请查收", "##### 加盟商姓名：{0}\n##### 面审时间：{1}\n##### 面审官：{2}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
+    MESSAGE_4("您有线索未通过面审，请查收", "##### 加盟商姓名：{partnerUsername}\n##### 面审时间：{interviewTime}\n##### 面审官：{interviewUsername}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
-    MESSAGE_5("您收到一份缴纳意向金审核，请查收", "##### 加盟商姓名：{0}\n##### 缴费时间：{1}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
+    MESSAGE_5("您收到一份缴纳意向金审核，请查收", "##### 加盟商姓名：{partnerUsername}\n##### 缴费时间：{payTime}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
-    MESSAGE_6("您收到一份加盟意向协议信息审核，请查收", "##### 加盟商姓名：{0}\n##### 手机号码：{1}\n##### 信息提交时间：{2}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
+    MESSAGE_6("您收到一份加盟意向协议信息审核，请查收", "##### 加盟商姓名：{partnerUsername}\n##### 手机号码：{partnerMobile}\n##### 信息提交时间：{submitTime}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
-    MESSAGE_7("您提交的一份加盟意向协议OA审核未通过，请查收", "##### 加盟商姓名：{0}\n##### 审批提交时间：{1}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
+    MESSAGE_7("您提交的一份加盟意向协议OA审核未通过，请查收", "##### 加盟商姓名：{partnerUsername}\n##### 审批提交时间：{1}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
-    MESSAGE_8("您有一位加盟商待安排体验门店及体验时间，请查收", "##### 加盟商姓名：{0}\n##### 手机号码：{1}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
+    MESSAGE_8("您有一位加盟商待安排体验门店及体验时间，请查收", "##### 加盟商姓名：{partnerUsername}\n##### 手机号码：{partnerMobile}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
-    MESSAGE_9("您有一位加盟商已放弃门店体验，请查收", "##### 加盟商姓名：{0}\n##### 手机号码：{1}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
+    MESSAGE_9("您有一位加盟商已放弃门店体验，请查收", "##### 加盟商姓名：{partnerUsername}\n##### 手机号码：{partnerMobile}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
-    MESSAGE_10("您收到一份二次面审预约，请查收", "##### 加盟商姓名：{0}\n##### 预约时间：{1}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
+    MESSAGE_10("您收到一份二次面审预约，请查收", "##### 加盟商姓名：{partnerUsername}\n##### 预约时间：{appointmentTime}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
-    MESSAGE_11("您的一个铺位已审核通过，请查收", "##### 铺位名称：{0}\n##### 铺位地址：{1}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
+    MESSAGE_11("您的一个铺位已审核通过，请查收", "##### 铺位名称：{pointName}\n##### 铺位地址：{pointAddress}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
-    MESSAGE_12("您的一个铺位审核未通过，请查收", "##### 铺位名称：{0}\n##### 铺位地址：{1}\n##### 未通过原因：{2}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
+    MESSAGE_12("您的一个铺位审核未通过，请查收", "##### 铺位名称：{pointName}\n##### 铺位地址：{pointAddress}\n##### 未通过原因：{reason}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
-    MESSAGE_13("您有一个铺位需要审核，请查收", "##### 铺位名称：{0}\n##### 铺位地址：{1}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
+    MESSAGE_13("您有一个铺位需要审核，请查收", "##### 铺位名称：{pointName}\n##### 铺位地址：{pointAddress}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
-    MESSAGE_14("已为您分配一位加盟商，请查收", "##### 加盟商姓名：{0}\n##### 手机号码：{1}\n##### 意向加盟区域：{2}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
+    MESSAGE_14("已为您分配一位加盟商，请查收", "##### 加盟商姓名：{partnerUsername}\n##### 手机号码：{partnerMobile}\n##### 意向加盟区域：{wantShopName}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
-    MESSAGE_15("您有一份加盟商上传的租赁合同待审核，请查收", "##### 加盟商姓名：{0}\n##### 提交时间：{1}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
+    MESSAGE_15("您有一份加盟商上传的租赁合同待审核，请查收", "##### 加盟商姓名：{0}\n##### 提交时间：{submitTime}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
     ;
 
     private String title;
@@ -45,7 +53,57 @@ public enum MessageEnum {
         return content;
     }
 
+    public String getContent(Map<String, String> paramMap){
+        String result = this.content;
+        for (String key : paramMap.keySet()) {
+            result.replaceAll("\\{" + key + "\\}", paramMap.get(key));
+        }
+        return result;
+    }
+
     public String getImageUrl() {
         return imageUrl;
     }
+
+
+    public String getMessageUrl(String domainUrl, String appId, String corpId, Map<String, String> paramMap){
+        if(StringUtils.isAnyBlank(domainUrl, appId, corpId) || Objects.isNull(paramMap)){
+            return "";
+        }
+        try {
+            switch (this) {
+                case MESSAGE_1:
+                case MESSAGE_2:
+                case MESSAGE_4:
+                case MESSAGE_5:
+                case MESSAGE_6:
+                case MESSAGE_7:
+                case MESSAGE_8:
+                case MESSAGE_9:
+                case MESSAGE_15:
+                    return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId="+ corpId + "&appUrl=" +
+                            URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=clue&lineId=" + paramMap.get("lineId"), StandardCharsets.UTF_8.name());
+                case MESSAGE_3:
+                case MESSAGE_10:
+                    return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId="+ corpId + "&appUrl=" +
+                            URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=interview&lineId=" + paramMap.get("lineId"), StandardCharsets.UTF_8.name());
+                case MESSAGE_11:
+                case MESSAGE_12:
+                    return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId="+ corpId + "&appUrl=" +
+                            URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=point&pointId=" + paramMap.get("pointId"), StandardCharsets.UTF_8.name());
+                case MESSAGE_13:
+                    return "dingtalk://dingtalkclient/action/open_micro_app?appId="+ appId +"&corpId=" + corpId + "&page=" +
+                            URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=point&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&lineId="+ paramMap.get("lineId"), StandardCharsets.UTF_8.name());
+                default:
+                    return "";
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
 }

coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java

@@ -51,6 +51,8 @@ public class CommonService {
     private SimpleMessageService simpleMessageService;
     @Value("${coolstore.page.domain}")
     private String coolStoreDomainUrl;
+    @Value("${cool.app.id}")
+    private String appId;
     @Value("${mybatis.configuration.variables.enterpriseId}")
     private String enterpriseId;
     @Value("${enterprise.dingCorpId}")
@@ -73,7 +75,7 @@ public class CommonService {
         return (AuditResultService) applicationContext.getBean(auditEnum.getClazz());
     }
 
-    public void sendMessage(List<String> userIds, MessageEnum message, String... param){
+    public void sendMessage(List<String> userIds, MessageEnum message, Map<String, String> requestMap){
         if(CollectionUtils.isEmpty(userIds)){
             return;
         }
@@ -81,9 +83,12 @@ public class CommonService {
         if(CollectionUtils.isEmpty(userIds)){
             return;
         }
-        String mobileParam = MessageFormat.format("{0}&eid={1}&corpId={2}&appType=dingding2&lineId={3}", "", enterpriseId, dingCorpId, null);
         try {
-            String messageUrl = coolStoreDomainUrl + "dd-noticemsg?miniAppId={0}&appId={1}&corpId={2}&appUrl=" + URLEncoder.encode("pages/common-web-view/index?routerUrl=notice&target=" + mobileParam, StandardCharsets.UTF_8.name());
+            String messageUrl = message.getMessageUrl(coolStoreDomainUrl, appId, dingCorpId, requestMap);
+            if(StringUtils.isBlank(messageUrl)){
+                log.info("获取通知url为空");
+                return;
+            }
             SendMessageDTO messageDTO = new SendMessageDTO();
             messageDTO.setCorpId(dingCorpId);
             messageDTO.setUserIds(String.join(Constants.COMMA, userIds));
@@ -91,17 +96,18 @@ public class CommonService {
             messageDTO.setAppType("dingding2");
             JSONObject map = new JSONObject();
             map.put("message_url", messageUrl);
+            map.put("pcMessageUrl", messageUrl);
             JSONObject headJson = new JSONObject();
             headJson.put("bgcolor", "FFBBBBBB");
             map.put("head", headJson);
             JSONObject body = new JSONObject();
             body.put("title", message.getTitle());
             body.put("image", message.getImageUrl());
-            body.put("content", MessageFormat.format(message.getContent(), param));
+            body.put("content", message.getContent(requestMap));
             map.put("body",body);
             messageDTO.setOaJson(map);
             simpleMessageService.send(JSONObject.toJSONString(messageDTO), RocketMqTagEnum.STORE_DING_QUEUE);
-        } catch (UnsupportedEncodingException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }

coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java

@@ -163,7 +163,11 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt
         if(InterviewTypeEnum.SECOND_INTERVIEW.equals(interviewType)){
             messageEnum = MessageEnum.MESSAGE_10;
         }
-        commonService.sendMessage(Arrays.asList(interviewerUserId), messageEnum, lineInfo.getUsername(), DateUtils.parseDateToStr(DateUtils.NOTICE_DATE, startTime));
+        Map<String, String> messageMap = new HashMap<>();
+        messageMap.put("lineId", String.valueOf(lineInfo.getId()));
+        messageMap.put("partnerUsername", lineInfo.getUsername());
+        messageMap.put("appointmentTime", DateUtils.parseDateToStr(DateUtils.NOTICE_DATE, startTime));
+        commonService.sendMessage(Arrays.asList(interviewerUserId), messageEnum, messageMap);
         return Boolean.TRUE;
     }
 
@@ -463,7 +467,12 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt
         lineInfoDAO.updateWorkflowStage(lineInfo.getId(), null, WorkflowSubStageStatusEnum.getInterviewRejectStatus(interviewType),userId);
         String noticeTime = DateUtils.parseDateToStr(DateUtils.NOTICE_DATE, interviewInfo.getStartTime());
         String interviewUserName = enterpriseUserDAO.getUserName(interviewInfo.getInterviewerUserId());
-        commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_4, lineInfo.getUsername(), noticeTime, interviewUserName);
+        Map<String, String> messageMap = new HashMap<>();
+        messageMap.put("lineId", String.valueOf(lineInfo.getId()));
+        messageMap.put("partnerUsername", lineInfo.getUsername());
+        messageMap.put("interviewTime", noticeTime);
+        messageMap.put("interviewUsername", interviewUserName);
+        commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_4, messageMap);
         return lineInterviewDAO.updateInterviewInfo(updateInterviewInfo) > 0;
     }
 

coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java

@@ -385,7 +385,11 @@ public class PointServiceImpl implements PointService {
                 result = pointInfoDAO.updatePointInfo(updatePoint);
             }
             List<String> sendMessageUserIds = JSONObject.parseArray(nextAuditRecord.getHandlerUserIds(), String.class);
-            commonService.sendMessage(sendMessageUserIds, MessageEnum.MESSAGE_13, pointInfo.getPointName(), pointInfo.getAddress());
+            Map<String, String> messageMap = new HashMap<>();
+            messageMap.put("pointId", String.valueOf(pointInfo.getId()));
+            messageMap.put("pointName", pointInfo.getPointName());
+            messageMap.put("pointAddress", pointInfo.getAddress());
+            commonService.sendMessage(sendMessageUserIds, MessageEnum.MESSAGE_13, messageMap);
         }else{
             PointInfoDO updatePoint = new PointInfoDO();
             updatePoint.setId(pointInfo.getId());
@@ -394,7 +398,11 @@ public class PointServiceImpl implements PointService {
             if(SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())){
                 initUploadRentContract(pointInfo);
             }
-            commonService.sendMessage(Arrays.asList(pointInfo.getDevelopmentManager()), MessageEnum.MESSAGE_11, pointInfo.getPointName(), pointInfo.getAddress());
+            Map<String, String> messageMap = new HashMap<>();
+            messageMap.put("pointId", String.valueOf(pointInfo.getId()));
+            messageMap.put("pointName", pointInfo.getPointName());
+            messageMap.put("pointAddress", pointInfo.getAddress());
+            commonService.sendMessage(Arrays.asList(pointInfo.getDevelopmentManager()), MessageEnum.MESSAGE_11, messageMap);
             result = pointInfoDAO.updatePointInfo(updatePoint);
         }
         return result;
@@ -414,7 +422,12 @@ public class PointServiceImpl implements PointService {
         pointInfoUpdate.setStorageStatus(StorageStatusEnum.NOT_IN_STORAGE.getCode());
         //删除剩余未完成的审核记录
         pointAuditRecordDAO.deletePointAuditRecord(pointId, pointInfo.getSubmitAuditCount());
-        commonService.sendMessage(Arrays.asList(pointInfo.getDevelopmentManager()), MessageEnum.MESSAGE_12, pointInfo.getPointName(), pointInfo.getAddress(), reason);
+        Map<String, String> messageMap = new HashMap<>();
+        messageMap.put("pointId", String.valueOf(pointInfo.getId()));
+        messageMap.put("pointName", pointInfo.getPointName());
+        messageMap.put("pointAddress", pointInfo.getAddress());
+        messageMap.put("reason", reason);
+        commonService.sendMessage(Arrays.asList(pointInfo.getDevelopmentManager()), MessageEnum.MESSAGE_12, messageMap);
         return pointInfoDAO.updatePointInfo(pointInfoUpdate);
     }
 
@@ -685,7 +698,13 @@ public class PointServiceImpl implements PointService {
         //更新已被选择的铺位的拓展经理
         pointInfoDAO.updateSelectedDevelopmentManager(lineId, request.getDevelopmentManager());
         String wantShopName = hyOpenAreaInfoDAO.selectNameMapById(lineInfo.getWantShopAreaId());
-        commonService.sendMessage(Arrays.asList(request.getDevelopmentManager()), MessageEnum.MESSAGE_14, lineInfo.getUsername(), lineInfo.getMobile(), wantShopName);
+
+        Map<String, String> messageMap = new HashMap<>();
+        messageMap.put("lineId", String.valueOf(lineId));
+        messageMap.put("partnerUsername", lineInfo.getUsername());
+        messageMap.put("partnerMobile", lineInfo.getMobile());
+        messageMap.put("wantShopName", wantShopName);
+        commonService.sendMessage(Arrays.asList(request.getDevelopmentManager()), MessageEnum.MESSAGE_14, messageMap);
         //删除未选择的推荐铺位
         return pointRecommendDAO.turnLineUpdateRecommendStatus(lineId, request.getDevelopmentManager());
     }

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java

@@ -31,7 +31,12 @@ public class PCTestController {
 
     @GetMapping("/sendMessage")
     public ResponseResult<Boolean> sendMessage(){
-        commonService.sendMessage(Arrays.asList("123836131931284423"), MessageEnum.MESSAGE_1, "张三", "浙江-杭州");
+        Map<String, String> messageMap = new HashMap<>();
+        messageMap.put("lineId", "217");
+        messageMap.put("partnerUsername", "彪~");
+        messageMap.put("partnerMobile", "17681878615");
+        messageMap.put("wantShopName", "杭州市余杭区");
+        commonService.sendMessage(Arrays.asList("123836131931284423"), MessageEnum.MESSAGE_14, messageMap);
         return ResponseResult.success(Boolean.FALSE);
     }
 

coolstore-partner-web/src/main/resources/application-ab.properties

@@ -79,6 +79,7 @@ xxl.job.accessToken = 25365115eed84e9ba5e0040abb255a09
 exhibition.channel.id=52399
 recommended.channel.id=52400
 
+cool.app.id=80685
 coolstore.page.domain=https://t2store.coolstore.cn/
 
 xfsg.url=https://inf-test.xianfengsg.com/InfService

coolstore-partner-web/src/main/resources/application-local.properties

@@ -74,6 +74,7 @@ wx.pay.privateKeyPath=D:\\weixin\\apiclient_key.pem
 aliyun.accessKeyId=LTAI5tQ6QBnWaB5LaJYz6zcD
 aliyun.accessKeySecret=spqsOgtfr54cwK861O3N3fInydTgjA
 
+cool.app.id=80685
 coolstore.page.domain=https://t2store.coolstore.cn/
 
 xfsg.url=https://inf-test.xianfengsg.com/InfService

coolstore-partner-web/src/main/resources/application-online.properties

@@ -79,6 +79,9 @@ xxl.job.accessToken=25365115eed84e9ba5e0040abb255a09
 exhibition.channel.id=52399
 recommended.channel.id=52400
 
+cool.app.id=78836
+coolstore.page.domain=https://store.coolstore.cn/
+
 xfsg.url=https://inf.xianfengsg.com/InfService
 
 aliyun.sms.accessKeyId=LTAI5tAVZ3r9UtSpLGcmGoQn

coolstore-partner-web/src/main/resources/application-test.properties

@@ -79,7 +79,8 @@ xxl.job.accessToken = 25365115eed84e9ba5e0040abb255a09
 exhibition.channel.id=52399
 recommended.channel.id=52400
 
-coolstore.page.domain=https://t2store.coolstore.cn/
+cool.app.id=80685
+coolstore.page.domain=https://tstore.coolstore.cn/
 
 xfsg.url=https://inf-test.xianfengsg.com/InfService