From c2a7aa5c8c0b0f1d360f01122f7e1720474bdee1 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 13 十月 2020 15:45:22 +0800
Subject: [PATCH] 优化欠费通知 小程序打开

---
 service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java b/service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java
index 86a1ddb..18d25db 100644
--- a/service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java
+++ b/service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java
@@ -14,6 +14,7 @@
 import com.java110.dto.task.TaskDto;
 import com.java110.entity.wechat.Content;
 import com.java110.entity.wechat.Data;
+import com.java110.entity.wechat.Miniprogram;
 import com.java110.entity.wechat.PropertyFeeTemplateMessage;
 import com.java110.intf.community.INoticeInnerServiceSMO;
 import com.java110.intf.community.IRoomInnerServiceSMO;
@@ -307,7 +308,14 @@
         JSONObject dataObj = paramOutObj.getJSONObject("data");
         JSONArray openids = dataObj.getJSONArray("openid");
         nextOpenid = paramOutObj.getString("next_openid");
-        String wechatUrl = MappingCache.getValue("OWNER_WECHAT_URL") + "/#/pages/notice/detail/detail?noticeId=";
+        String wechatUrl = MappingCache.getValue("OWNER_WECHAT_URL");
+        Miniprogram miniprogram = null;
+        if (wechatUrl.startsWith("https://") || wechatUrl.startsWith("http://")) {
+
+        } else {
+            miniprogram = new Miniprogram();
+            miniprogram.setAppid(wechatUrl);
+        }
         for (int openIndex = 0; openIndex < openids.size(); openIndex++) {
             String openId = openids.getString(openIndex);
             Data data = new Data();
@@ -320,7 +328,14 @@
             data.setKeyword3(new Content(noticeDto.getContext()));
             data.setRemark(new Content("濡傛湁鐤戦棶璇疯仈绯荤浉鍏崇墿涓氫汉鍛�"));
             templateMessage.setData(data);
-            templateMessage.setUrl(wechatUrl + noticeDto.getNoticeId());
+            if (!StringUtil.isEmpty(wechatUrl)) {
+                if (miniprogram == null) {
+                    templateMessage.setUrl(wechatUrl + "/#/pages/notice/detail/detail?noticeId=" + noticeDto.getNoticeId());
+                } else {
+                    miniprogram.setPagepath("/pages/notice/detail/detail?noticeId=" + noticeDto.getNoticeId());
+                    templateMessage.setMiniprogram(miniprogram);
+                }
+            }
             logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
             ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(sendMsgUrl + accessToken, JSON.toJSONString(templateMessage), String.class);
             logger.info("寰俊妯℃澘杩斿洖鍐呭:{}", responseEntity);

--
Gitblit v1.8.0