From b887184649c74b5a3e70f7ec34767d73aca161c4 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 27 Oct 2020 11:14:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=A2=E6=88=B7=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E6=A8=A1=E6=9D=BF=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WxmpMessageServiceImpl.java  | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java
index c7b938a6ff..279c392d83 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java
@@ -32,14 +32,8 @@ import com.epmet.dao.WxmpResiUserSubscribeDao;
 import com.epmet.dao.WxmpTemplateMsgSubscribeStatusDao;
 import com.epmet.dao.WxmpUserSubscribeRecordDao;
 import com.epmet.dao.WxmpWorkUserSubscribeDao;
-import com.epmet.dto.form.GetTemplateListFormDTO;
-import com.epmet.dto.form.StaffBasicInfoFormDTO;
-import com.epmet.dto.form.UserBasicInfoFormDTO;
-import com.epmet.dto.form.WxSubscribeMessageFormDTO;
-import com.epmet.dto.result.GetTemplateListResultDTO;
-import com.epmet.dto.result.StaffBasicInfo;
-import com.epmet.dto.result.UserBasicInfo;
-import com.epmet.dto.result.WxMsgAuthInfoResultDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.*;
 import com.epmet.entity.*;
 import com.epmet.exception.WxSubscribeException;
 import com.epmet.feign.EpmetUserOpenFeignClient;
@@ -337,6 +331,27 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
         List<GetTemplateListResultDTO> resultList = (List<GetTemplateListResultDTO>) mapToResult.getData();
         return resultList;
     }
+    /**
+     * @return
+     * @Description 查询客户两个端小程序对应的站内信模板Id
+     * @author sun
+     */
+    private List<CustomerTemplateListResultDTO> customerTemplateList(CustomerTemplateListFormDTO formDTO) {
+        String url = "https://epmet-cloud.elinkservice.cn/api/third/personaltemplate/templatelist";
+        String data = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(formDTO)).getData();
+        logger.info("ThirdLoginServiceImpl.customerTemplateList：httpclient->url:" + url + "，结果->" + data);
+        JSONObject toResult = JSON.parseObject(data);
+        Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class);
+        if (null != toResult.get("code")) {
+            mapToResult.setCode(((Integer) toResult.get("code")).intValue());
+        }
+        if (!mapToResult.success()) {
+            logger.error("调用epmet_third服务获取客户小程序消息订阅模板数据失败");
+            throw new RenException(mapToResult.getCode());
+        }
+        List<CustomerTemplateListResultDTO> resultList = (List<CustomerTemplateListResultDTO>) mapToResult.getData();
+        return resultList;
+    }
 
     @Override
     public WxMsgAuthInfoResultDTO getAuthorizationInfo(String customerId, String clientType, String loginUserId, String templateId) {