Merge remote-tracking branch 'origin/dev_thirdplatform' into dev

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java

@@ -12,10 +12,8 @@ import com.epmet.constant.ThirdRedisKeyConstant;
 import com.epmet.constant.ThirdRunTimeInfoConstant;
 import com.epmet.dao.*;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.AuthCodeResultDTO;
-import com.epmet.dto.result.AuthorizationInfoResultDTO;
-import com.epmet.dto.result.CreateOpenResultDTO;
-import com.epmet.dto.result.WillOverDueResultDTO;
+import com.epmet.dto.result.*;
+import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.mpaes.WXBizMsgCrypt;
 import com.epmet.mpaes.WXXmlToMapUtil;
 import com.epmet.redis.RedisThird;
@@ -77,6 +75,8 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
     private MiniCategoryInfoDao miniCategoryInfoDao;
     @Autowired
     private BusinessInfoDao businessInfoDao;
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
     @Value("${third.platform.appId}")
     private String componentAppId;
@@ -372,7 +372,8 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
         String authCode = authCodeAndTime.getAuthCode();
         String client = authCodeAndTime.getClientType();
         String expiresIn = authCodeAndTime.getExpiresIn();
-        String customerId = tokenDto.getCustomerId();
+//        String customerId = tokenDto.getCustomerId();
+        String customerId = this.getLoginUserCustomerId(tokenDto);
         Date expiresInTime = this.countExpirationTime(expiresIn);
         if (StringUtils.isBlank(customerId)||StringUtils.isBlank(client)||StringUtils.isBlank(authCode)||StringUtils.isBlank(expiresIn)){
             log.info("客户ID = "+customerId+", 客户端类型为 = "+client+", 授权码为 = "+authCode+", 有效期 = "+expiresIn);
@@ -547,4 +548,11 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
         date.setTime(l);
         return date;
     }
+
+    public String getLoginUserCustomerId(TokenDto tokenDto){
+        LoginUserDetailsFormDTO dto = new LoginUserDetailsFormDTO();
+        BeanUtils.copyProperties(tokenDto,dto);
+        LoginUserDetailsResultDTO data = epmetUserOpenFeignClient.getLoginUserDetails(dto).getData();
+        return data.getCustomerId();
+    }
 }