From c5e8177c3fbc27ac825f38c465383903adb87596 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 01 十一月 2022 13:59:08 +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 | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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 edf3e5b..438bdce 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;
@@ -524,8 +525,8 @@
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);
@@ -549,8 +550,8 @@
subscribeDTO.setTemplate_id(templateId);
subscribeDTO.setPage("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);
@@ -575,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", 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);
@@ -601,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", 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);
@@ -627,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", 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);
@@ -653,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", 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);
--
Gitblit v1.7.1