From 91dd850602ed9b3c65603a4466c3a98158b19fdd Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 31 Jul 2020 17:40:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=86=89=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/ThirdLoginServiceImpl.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
index b059e60bf4..9fa2b40054 100644
--- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
@@ -507,7 +507,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
     public PaCustomerDTO getCustomerInfo(String appId){
         JSONObject jsonObject = new JSONObject();
         String data = HttpClientManager.getInstance().sendPostByJSON(AuthHttpUrlConstant.CUSTOMER_MSG_URL + appId, JSON.toJSONString(jsonObject)).getData();
-        logger.info("httpclient->url:"+AuthHttpUrlConstant.CUSTOMER_MSG_URL+"，结果->"+data);
+        logger.info("ThirdLoginServiceImpl.getCustomerInfo：httpclient->url:"+AuthHttpUrlConstant.CUSTOMER_MSG_URL+"，结果->"+data);
         JSONObject toResult = JSON.parseObject(data);
         Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class);
         if (!mapToResult.success()) {
@@ -516,8 +516,8 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
         }
         Object PublicCustomerResultDTO = mapToResult.getData();
         JSONObject json = JSON.parseObject(PublicCustomerResultDTO.toString());
-        PublicCustomerResultDTO publicCustomerResultDTO = ConvertUtils.mapToEntity(json, PublicCustomerResultDTO.class);
-        PaCustomerDTO customer  = publicCustomerResultDTO.getCustomer();
+        Map<String,Object> map = (Map)jsonObject.get("customer");
+        PaCustomerDTO customer = ConvertUtils.mapToEntity(map, PaCustomerDTO.class);
         logger.info("小程序登陆third服务获取客户用户信息PaCustomerDTO->"+customer);
         return customer;
     }
@@ -529,7 +529,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
      */
     public UserWechatDTO getUserWeChat(WxLoginFormDTO resiLoginFormDTO){
         String data = HttpClientManager.getInstance().sendPostByJSON(AuthHttpUrlConstant.RESI_AND_WORK_LOGIN_URL, JSON.toJSONString(resiLoginFormDTO)).getData();
-        logger.info("httpclient->url:"+AuthHttpUrlConstant.RESI_AND_WORK_LOGIN_URL+"，结果->"+data);
+        logger.info("ThirdLoginServiceImpl.getUserWeChat：httpclient->url:"+AuthHttpUrlConstant.RESI_AND_WORK_LOGIN_URL+"，结果->"+data);
         JSONObject toResult = JSON.parseObject(data);
         Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class);
         if (!mapToResult.success()) {