From 5256abe57aabebffc7254ea33ef29f4d3629ab2f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 24 十月 2022 14:19:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/util/WxUtil.java | 55 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 44 insertions(+), 11 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 c75e205..1632219 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,7 +2,9 @@
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.gen.entity.SysUser;
import com.dg.core.db.manual.mapper.util.ConstantPropertiesUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -24,6 +26,8 @@
public class WxUtil {
private static String ACCESS_TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential";
+
+ private static String miniprogramState="trial";//trial 为测试版 formal 为正式版 切记发布版本时候改为正式版
/**
* 获取花城token，（ps:0=token获取失败）
@@ -194,18 +198,46 @@
* @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
+ subscribeDTO.setMiniprogram_state(miniprogramState);
+ subscribeDTO.setPage("packageE/pages/myApply/myApply");
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);
+ try {
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ System.out.println(e.getMessage());
+ }
+ }
+
+
+ /**
+ * 工单提交推送
+ *
+ * @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(miniprogramState);
+ subscribeDTO.setPage("packageE/pages/applyHandle/index/index");
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ 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);
@@ -223,17 +255,18 @@
* @param accessToken
* token会话标识
*/
- public void sendGuideRepairOrderOvertime(String openId, String accessToken, String templateId, GuideRepairOrder guideRepairOrder){
+ public void sendGuideRepairOrderOvertime(String openId, String accessToken, String templateId, SysUser sysUser){
WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
subscribeDTO.setTouser(openId);
subscribeDTO.setTemplate_id(templateId);
- subscribeDTO.setMiniprogram_state("formal");//测试,部署正式版本时候需要更改为formal
+ subscribeDTO.setMiniprogram_state(miniprogramState);
+ subscribeDTO.setPage("packageE/pages/applyHandle/index/index");
List<TemplateParam> paras=new ArrayList<TemplateParam>();
Calendar calendar = Calendar.getInstance();
- paras.add(new TemplateParam("thing4","给您分配的工单:'"+guideRepairOrder.getMatterName()+"',已超时请即使处理"));//超时提示内容
- paras.add(new TemplateParam("thing2",guideRepairOrder.getConsultUserName()));//咨询人
- paras.add(new TemplateParam("thing3",guideRepairOrder.getConsultContent()));//咨询内容
- subscribeDTO.setTemplateParamList(paras);
+ calendar.setTime(new Date());
+ paras.add(new TemplateParam("time1",calendar.get(Calendar.YEAR)+"年"+(calendar.get(Calendar.MONTH)+1)+"月"+calendar.get(Calendar.DATE)+"日"));//超时时间
+ paras.add(new TemplateParam("thing2",sysUser.getUserName()+"导办人员有个工单已超时"));//咨询人
+ subscribeDTO.setTemplateParamList(paras);
try {
sendSubscribe(accessToken,subscribeDTO);
}catch (Exception e){
--
Gitblit v1.7.1