From 73f86cb94faa49f1157d6c9f00737a28f63507f4 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期六, 26 十一月 2022 09:52:48 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxUtil.java | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 111 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxUtil.java
index 86ddeee..19750a6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxUtil.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxUtil.java
@@ -3,6 +3,7 @@
import java.math.BigDecimal;
import java.util.*;
+import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.constants.WxSubscribeConstants;
@@ -481,6 +482,33 @@
log.error(e.getMessage());
}
}
+
+ /**
+ * ws洗车订单状态更改
+ * @param openId
+ * @param accessToken
+ * @param status
+ * @param washerName
+ * @param washerMobile
+ * @param phone
+ * @param templateId
+ */
+ public static void sendWsWash(String openId, String accessToken, String status,String washerName,String washerMobile,String phone,String templateId){
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ subscribeDTO.setPage("pages/washer/order/index");
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("thing2", "上门洗车"));
+ paras.add(new TemplateParam("thing5", phone));
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ log.info(subscribeDTO.toString());
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ log.error(e.getMessage());
+ }
+ }
/**
* uu洗车订单状态更改
* @param openId
@@ -497,8 +525,33 @@
subscribeDTO.setTemplate_id(templateId);
subscribeDTO.setPage("packageD/pages/washer/order/index");
List<TemplateParam> paras=new ArrayList<TemplateParam>();
- paras.add(new TemplateParam("thing9", washerName));
- paras.add(new TemplateParam("phone_number10",washerMobile));
+ paras.add(new TemplateParam("thing9", StrUtil.isBlank(washerName) ? "无":washerName));
+ paras.add(new TemplateParam("phone_number10",StrUtil.isBlank(washerMobile) ? "0":washerMobile));
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ log.error(e.getMessage());
+ }
+ }
+ /**
+ * ws洗车订单状态更改
+ * @param openId
+ * @param accessToken
+ * @param status
+ * @param washerName
+ * @param washerMobile
+ * @param phone
+ * @param templateId
+ */
+ public static void sendWsWash3(String openId, String accessToken, String status,String washerName,String washerMobile,String phone,String templateId){
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ subscribeDTO.setPage("pages/washer/order/index");
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("thing9", StrUtil.isBlank(washerName) ? "无":washerName));
+ paras.add(new TemplateParam("phone_number10",StrUtil.isBlank(washerMobile) ? "0" :washerMobile));
subscribeDTO.setTemplateParamList(paras);
try {
sendSubscribe(accessToken,subscribeDTO);
@@ -523,8 +576,34 @@
subscribeDTO.setPage("packageD/pages/washer/order/index");
List<TemplateParam> paras=new ArrayList<TemplateParam>();
paras.add(new TemplateParam("thing4", status));
- paras.add(new TemplateParam("thing3", washerName));
- paras.add(new TemplateParam("thing6",washerMobile));
+ paras.add(new TemplateParam("thing3", StrUtil.isBlank(washerName) ? "无":washerName));
+ paras.add(new TemplateParam("thing6",StrUtil.isBlank(washerMobile) ? "无":washerMobile));
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ log.error(e.getMessage());
+ }
+ }
+ /**
+ * ws洗车订单状态更改
+ * @param openId
+ * @param accessToken
+ * @param status
+ * @param washerName
+ * @param washerMobile
+ * @param phone
+ * @param templateId
+ */
+ public static void sendWsWash4(String openId, String accessToken, String status,String washerName,String washerMobile,String phone,String templateId){
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ subscribeDTO.setPage("pages/washer/order/index");
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("thing4", status));
+ paras.add(new TemplateParam("thing3", StrUtil.isBlank(washerName) ? "无":washerName));
+ paras.add(new TemplateParam("thing6",StrUtil.isBlank(washerMobile) ? "无":washerMobile));
subscribeDTO.setTemplateParamList(paras);
try {
sendSubscribe(accessToken,subscribeDTO);
@@ -549,8 +628,34 @@
subscribeDTO.setPage("packageD/pages/washer/order/index");
List<TemplateParam> paras=new ArrayList<TemplateParam>();
paras.add(new TemplateParam("phrase14", status));
- paras.add(new TemplateParam("name3", washerName));
- paras.add(new TemplateParam("thing5",washerMobile));
+ paras.add(new TemplateParam("name3", StrUtil.isBlank(washerName) ? "无":washerName));
+ paras.add(new TemplateParam("thing5",StrUtil.isBlank(washerMobile) ? "无":washerMobile));
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ log.error(e.getMessage());
+ }
+ }
+ /**
+ * ws洗车订单状态更改
+ * @param openId
+ * @param accessToken
+ * @param status
+ * @param washerName
+ * @param washerMobile
+ * @param phone
+ * @param templateId
+ */
+ public static void sendWsWash6(String openId, String accessToken, String status,String washerName,String washerMobile,String phone,String templateId){
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ subscribeDTO.setPage("pages/washer/order/index");
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("phrase14", status));
+ paras.add(new TemplateParam("name3", StrUtil.isBlank(washerName) ? "无":washerName));
+ paras.add(new TemplateParam("thing5",StrUtil.isBlank(washerMobile) ? "无":washerMobile));
subscribeDTO.setTemplateParamList(paras);
try {
sendSubscribe(accessToken,subscribeDTO);
--
Gitblit v1.7.1