From 01d599539a7f58932dd1f4cbf0025e238846dc22 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 28 May 2020 19:06:44 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B9=A6=E8=AE=B0=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E3=80=91=E3=80=90=E5=BE=AE=E4=BF=A1=E9=80=9A=E7=9F=A5=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E5=B7=A5=E5=85=B7=E4=BB=A5=E5=8F=8Ademo=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/service/impl/MessageServiceImpl.java  | 4 ++--
 .../java/com/elink/esua/epdc/utils/WxSendMessageUtils.java    | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java
index 3aba3750b..132f983f0 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java
@@ -180,7 +180,7 @@ public class MessageServiceImpl implements MessageService {
         String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=" + access_token;
 
         // 获取openID
-       /* Result<UserWorkAndAnalyOpenIdDTO> userIdsResult = adminFeignClient.userRelationWorkAndAnalyOpenId();
+        /*Result<UserWorkAndAnalyOpenIdDTO> userIdsResult = adminFeignClient.userRelationWorkAndAnalyOpenId();
         if(userIdsResult == null || userIdsResult.getData() == null){
             return new Result().error("获取openid失败！");
         }
@@ -207,7 +207,7 @@ public class MessageServiceImpl implements MessageService {
         keyword2.setValue("2019年10月1日");
         m.put("time2", keyword2);
 
-        WxSendMessageUtils.sendMessageByOpenId(openId,url,miniprogram_state,template_id,m,lang);
+        String resultMsg = WxSendMessageUtils.sendMessageByOpenId(openId,url,miniprogram_state,template_id,m,lang);
 
         return new Result().ok("消息推送成功！");
     }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/utils/WxSendMessageUtils.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/utils/WxSendMessageUtils.java
index f265bad2a..29853477b 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/utils/WxSendMessageUtils.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/utils/WxSendMessageUtils.java
@@ -64,7 +64,7 @@ public class WxSendMessageUtils {
      * @author wanggonfeng
      * @date 2020/05/26 14:18
      */
-    public static void sendMessageByOpenId(String openId, String url, String miniprogram_state, String template_id, Map<String, TemplateData> m,String lang){
+    public static String sendMessageByOpenId(String openId, String url, String miniprogram_state, String template_id, Map<String, TemplateData> m,String lang){
         //拼接推送的模版
         WxMssVo wxMssVo = new WxMssVo();
         wxMssVo.setTouser(openId);//用户openid
@@ -74,6 +74,7 @@ public class WxSendMessageUtils {
         wxMssVo.setLang(lang);
         ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, wxMssVo, String.class);
         log.error("小程序推送结果={}", responseEntity.getBody());
+        return responseEntity.getBody();
     }
 
     /**