diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/wechat/WechatTemplateDetailEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/wechat/WechatTemplateDetailEnum.java index f94d68138..1e8484d73 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/wechat/WechatTemplateDetailEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/wechat/WechatTemplateDetailEnum.java @@ -12,6 +12,13 @@ public enum WechatTemplateDetailEnum { TIME14("完成时间","time14"), THING25("客户名称","thing25"), THING60("位置","thing60"), + + + THING6("工单标题","thing6"), + TIME33("创建时间","time33"), + CHARACTER_STRING14("工单编号","character_string14"), + + ; diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/wechat/WechatTemplateEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/wechat/WechatTemplateEnum.java index dc4906ebe..2ce643e36 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/wechat/WechatTemplateEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/wechat/WechatTemplateEnum.java @@ -18,6 +18,9 @@ public enum WechatTemplateEnum { QUESTION_NOTICE("QUESTION_NOTICE", "T3sp5gBItHKD8oCeEiQMjn7JXpngFiz3dDcaArk84xY", "收到工单通知", Arrays.asList(CHARACTER_STRING2,THING10,TIME14,THING25,THING60)), + NEW_QUESTION_NOTICE("new_question_notice", "35rmoQ5wEHvUgCgSIJ2CpOb1DOJgWOiy8J7DXT_e4_Y", "新工单提醒", + Arrays.asList(THING6,TIME33,CHARACTER_STRING14)), + ; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java index 584c68eb5..a47132d08 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java @@ -239,13 +239,11 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { MessageTemplateDO messageTemplateDO = list.get(0); Map data = new HashMap<>(); - data.put(WechatTemplateDetailEnum.CHARACTER_STRING2.getCode(), "ceshi002"); - data.put(WechatTemplateDetailEnum.THING10.getCode(), messageTemplateDO.getMessageTitle()); - data.put(WechatTemplateDetailEnum.TIME14.getCode(), DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START_1, messageTemplateDO.getDeadline())); - data.put(WechatTemplateDetailEnum.THING25.getCode(), "正新管理有限公司"); - data.put(WechatTemplateDetailEnum.THING60.getCode(), "上海市-松江区"); + data.put(WechatTemplateDetailEnum.THING6.getCode(), messageTemplateDO.getMessageTitle()); + data.put(WechatTemplateDetailEnum.TIME33.getCode(), DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START_1, messageTemplateDO.getPublishTime())); + data.put(WechatTemplateDetailEnum.CHARACTER_STRING14.getCode(), messageTemplateDO.getMessageCode()); openIdList.forEach(x->{ - wechatTemplateService.sendMiniAppTemplate(x, WechatTemplateEnum.QUESTION_NOTICE,data,null); + wechatTemplateService.sendMiniAppTemplate(x, WechatTemplateEnum.NEW_QUESTION_NOTICE,data,"pages/notification/index"); }); } catch (Exception e) { log.info("发布流程异常 e:{}",e.getMessage()); diff --git a/coolstore-partner-web/src/main/resources/application-ab.properties b/coolstore-partner-web/src/main/resources/application-ab.properties index a4c6e43aa..802a16302 100644 --- a/coolstore-partner-web/src/main/resources/application-ab.properties +++ b/coolstore-partner-web/src/main/resources/application-ab.properties @@ -133,5 +133,8 @@ hqt.token.grant_type=client_credentials hqt.token.client.id=WrPffdGpcWkcPsbN hqt.token.client.secret=rYe9Cwug5LwQNIBJAiW0a7weF9CAhYCD +#fuwuhao appId wechat.mp.appId=wx4a18ef8bb41aa55c wechat.mp.appSecret=793904b58f4ecdead3bbe4312c5f5c45 +#xiaochengxu appid +wechat.miniapp.appId=wxd77a2761c1911ee1 \ No newline at end of file diff --git a/coolstore-partner-web/src/main/resources/application-online.properties b/coolstore-partner-web/src/main/resources/application-online.properties index 4701a60c9..683eb9ba6 100644 --- a/coolstore-partner-web/src/main/resources/application-online.properties +++ b/coolstore-partner-web/src/main/resources/application-online.properties @@ -136,5 +136,8 @@ hqt.token.grant_type=client_credentials hqt.token.client.id=WrPffdGpcWkcPsbN hqt.token.client.secret=rYe9Cwug5LwQNIBJAiW0a7weF9CAhYCD +#fuwuhao appId wechat.mp.appId=wx4a18ef8bb41aa55c -wechat.mp.appSecret=793904b58f4ecdead3bbe4312c5f5c45 \ No newline at end of file +wechat.mp.appSecret=793904b58f4ecdead3bbe4312c5f5c45 +#xiaochengxu appid +wechat.miniapp.appId=wxd77a2761c1911ee1 \ No newline at end of file