suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
zhangchenbiao
2024-05-11 13:56:41 +08:00
parent d7819f8907 a37c20e840
commit 5ba2a70ec4
11 changed files with 198 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,9 @@ public enum MessageEnum {
MESSAGE_22("您收到一位员工由您带教，请查收", "##### 员工姓名：【${userName}】，员工手机号码：【${mobile}】，登记时间：【${registerTime}】"),
MESSAGE_23("您有一个门店待发布加盟费/保证金账单，请查收", "##### 门店名称：${storeName}\n##### 加盟商姓名：${partnerName}\n##### 加盟商手机号码：${partnerMobile}\n"),
MESSAGE_24("您有一个门店待预约三方验收时间，请查收", "#####门店名称：${storeName}\n##### 加盟商姓名：${partnerUsername}\n##### 加盟商手机号码：${partnerMobile}\n"),
MESSAGE_25("您有一个门店待进行三方验收，请查收","#####门店名称：${storeName}\n#####加盟商姓名：${partnerUsername}\n#####加盟商手机号码：${partnerMobile}\n"),
MESSAGE_26("您有一个门店需要上传开业运营方案，请查收","#####门店名称：${storeName}\n#####加盟商姓名：${partnerUsername}\n#####加盟商手机号码：${partnerMobile}\n"),
MESSAGE_27("您有一个门店需要上传首批订货清单，请查收","#####门店名称：${storeName}\n#####加盟商姓名：${partnerUsername}\n#####加盟商手机号码：${partnerMobile}\n"),
;
private String title;
@@ -108,11 +111,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&timestamp="+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&timestamp=" + 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&timestamp="+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&timestamp=" + 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&timestamp="+System.currentTimeMillis()+"&userDetailId="+ paramMap.get("userDetailId"), StandardCharsets.UTF_8.name());
@@ -122,6 +126,15 @@ public enum MessageEnum {
case MESSAGE_24:
return "dingtalk://dingtalkclient/action/open_micro_app?appId="+appId+"&corpId="+corpId+"&page=" +
URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=employeeTraining&timestamp="+System.currentTimeMillis(), StandardCharsets.UTF_8.name());
case MESSAGE_25:
return "dingtalk://dingtalkclient/action/open_micro_app?appId="+appId+"&corpId="+corpId+"&page=" +
URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=employeeTraining&timestamp="+System.currentTimeMillis(), StandardCharsets.UTF_8.name());
case MESSAGE_26:
return "dingtalk://dingtalkclient/action/open_micro_app?appId="+appId+"&corpId="+corpId+"&page=" +
URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=employeeTraining&timestamp="+System.currentTimeMillis()+"&shopId="+ paramMap.get("shopId"), StandardCharsets.UTF_8.name());
case MESSAGE_27:
return "dingtalk://dingtalkclient/action/open_micro_app?appId="+appId+"&corpId="+corpId+"&page=" +
URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=employeeTraining&timestamp="+System.currentTimeMillis()+"&shopId="+ paramMap.get("shopId"), StandardCharsets.UTF_8.name());
default:
return "";

9
coolstore-partner-common/src/main/java/com/cool/store/utils/CoolDateUtils.java
View File

@@ -94,7 +94,14 @@ public class CoolDateUtils {
}
return date;
}
public static final String DateFormat(Date date,String format){
if (StringUtils.isBlank(format)){
return null;
}
DateFormat dateFormat = new SimpleDateFormat(format);
String str = dateFormat.format(date);
return str;
}
}