From dd730295a1df836c872d22a69a816f52e4c5d431 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 19 十月 2022 15:05:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/util/WxUtil.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/util/WxUtil.java b/flower_city/src/main/java/com/dg/core/util/WxUtil.java
index bb39e08..fcf3365 100644
--- a/flower_city/src/main/java/com/dg/core/util/WxUtil.java
+++ b/flower_city/src/main/java/com/dg/core/util/WxUtil.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.dg.core.db.gen.entity.GuideEvolveEntity;
import com.dg.core.db.gen.entity.GuideRepairOrder;
import com.dg.core.db.manual.mapper.util.ConstantPropertiesUtil;
import lombok.extern.slf4j.Slf4j;
@@ -194,16 +195,16 @@
* @param accessToken
* token会话标识
*/
- public void sendGuideRepairOrderComplete(String openId, String accessToken, String templateId, GuideRepairOrder guideRepairOrder){
+ public void sendGuideRepairOrderComplete(String openId, String accessToken, String templateId, GuideEvolveEntity guideRepairOrder){
WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
subscribeDTO.setTouser(openId);
subscribeDTO.setTemplate_id(templateId);
subscribeDTO.setMiniprogram_state("formal");//测试,部署正式版本时候需要更改为formal
List<TemplateParam> paras=new ArrayList<TemplateParam>();
Calendar calendar = Calendar.getInstance();
- paras.add(new TemplateParam("thing1",guideRepairOrder.getMatterName()));//业务办理类型
- paras.add(new TemplateParam("thing3","已完成"));
- paras.add(new TemplateParam("phrase8","待评价"));
+ paras.add(new TemplateParam("thing1","导办申请"));//业务办理类型
+ paras.add(new TemplateParam("thing3",guideRepairOrder.getRemark()));
+ paras.add(new TemplateParam("phrase8","已完成"));
calendar.setTime(new Date());
paras.add(new TemplateParam("time4",calendar.get(Calendar.YEAR)+"年"+(calendar.get(Calendar.MONTH)+1)+"月"+calendar.get(Calendar.DATE)+"日"));//结束日期
subscribeDTO.setTemplateParamList(paras);
@@ -215,5 +216,32 @@
}
+ /**
+ * 工单提交推送
+ *
+ * @param openId
+ * 用户openid
+ * @param accessToken
+ * token会话标识
+ */
+ public void sendGuideRepairOrderSubmit(String openId, String accessToken, String templateId, GuideRepairOrder guideRepairOrder){
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ subscribeDTO.setMiniprogram_state("formal");//测试,部署正式版本时候需要更改为formal
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ Calendar calendar = Calendar.getInstance();
+ paras.add(new TemplateParam("thing4","您有一个新的导办工单需要处理"));//超时提示内容
+ paras.add(new TemplateParam("thing2",guideRepairOrder.getConsultUserName()));//咨询人
+ paras.add(new TemplateParam("thing3",guideRepairOrder.getConsultContent()));//咨询内容
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ System.out.println(e.getMessage());
+ }
+ }
+
+
}
--
Gitblit v1.7.1