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

@@ -416,17 +416,22 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
         String authAppId = authorizationInfoResultDTO.getAuthorizer_appid();
         List<FixationAppIdResultDTO> fixationAppIdResultDTOS = fixationAppIdDao.selectFixationInfos();
         String finalCustomerId = customerId;//
+        log.info("新customerId为："+customerId);
+        log.info("新finalCustomerId为："+finalCustomerId);
         fixationAppIdResultDTOS.forEach(fixationAppId -> {
             if (fixationAppId.getAppId().equals(authAppId)){
                 // TODO 是城阳项目或者党群e事通
                 //  crm表中的customerId【原customerId】
                 String masterCustomerId = fixationAppId.getMasterCustomerId();
+                log.info("老customerId为："+masterCustomerId);
                 formDTO.setCustomerId(masterCustomerId);
                 authCodeDao.deleteCustomerAuthCode(finalCustomerId,clientType);
                 authCodeDao.insertRedirectAuthCode(formDTO);
                 //authCode存缓存
                 redisThird.setAuthCode(formDTO);
 
+                log.info("=======================公众号的客户id为："+finalCustomerId);
+
                 ModifyCustomerFormDTO modifyCustomer = new ModifyCustomerFormDTO();
                 modifyCustomer.setOldCustomerId(finalCustomerId);
                 modifyCustomer.setNewCustomerId(masterCustomerId);
@@ -434,6 +439,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
 
                 // 管理员授权
                 CustomerManagerFormDTO customerManager = paUserDao.selectManagerInfo(finalCustomerId);
+                log.info("=======================公众号的客户id为："+finalCustomerId);
                 customerManager.setCustomerId(finalCustomerId);
                 operCrmOpenFeignClient.addManager(customerManager);
             }