From 68fd2f086d80dd766dd3f84b7a92a2683547fb00 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 02 十一月 2022 15:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxUtil.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 438bdce..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
@@ -525,7 +525,7 @@
subscribeDTO.setTemplate_id(templateId);
subscribeDTO.setPage("packageD/pages/washer/order/index");
List<TemplateParam> paras=new ArrayList<TemplateParam>();
- paras.add(new TemplateParam("thing9", StrUtil.isBlank(washerName) ? "":washerName));
+ paras.add(new TemplateParam("thing9", StrUtil.isBlank(washerName) ? "无":washerName));
paras.add(new TemplateParam("phone_number10",StrUtil.isBlank(washerMobile) ? "0":washerMobile));
subscribeDTO.setTemplateParamList(paras);
try {
@@ -576,8 +576,8 @@
subscribeDTO.setPage("packageD/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));
+ 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);
@@ -602,8 +602,8 @@
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));
+ 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);
@@ -628,8 +628,8 @@
subscribeDTO.setPage("packageD/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));
+ 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);
@@ -654,8 +654,8 @@
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));
+ 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