加好友

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WxEnterpriseServiceImpl.java

@@ -183,6 +183,10 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
     
     @Override
     public void updateWxSecurityType(String wxEnterpriseId) {
+        WxEnterpriseQwDTO qwDTO = this.getQwInfo(wxEnterpriseId) ;
+        if(qwDTO.getWxSecurityType()==5) {
+            return ;
+        }
         int wxSecurityType = this.calcSecretType(wxEnterpriseId);
         if(wxSecurityType < 1 || wxSecurityType > 4) {
             return ;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java

 package com.gic.haoban.manage.service.service.out.impl;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
@@ -121,6 +122,7 @@ import com.gic.member.tag.api.dto.outapi.MemberTagSingleDTO;
 import com.gic.member.tag.api.service.MemberTagOpenApiService;
 import com.gic.mq.sdk.GicMQClient;
 import com.gic.redis.data.util.RedisUtil;
+import com.gic.wechat.api.dto.qywx.QywxNewExternalUseridDTO;
 import com.gic.wechat.api.dto.qywx.UnionidToExternalUseridDTO;
 import com.gic.wechat.api.dto.qywx.welcome.QywxExternalMessageBaseDTO;
 import com.gic.wechat.api.dto.qywx.welcome.QywxFileExternalBaseDTO;
@@ -1153,6 +1155,15 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             if(StringUtils.isNoneBlank(externalUserDTO.getUnionId())) {
                 dto.setUnionid(externalUserDTO.getUnionId());
             }
+            dto.setSelfExternalUserid(dto.getSelfExternalUserid());
+            try {
+                List<QywxNewExternalUseridDTO> list = this.qywxUserApiService.getSelfNewExternalUseridByList(qwDTO.getDkCorpid(), qwDTO.getSelfSecret(), Arrays.asList(dto.getSelfExternalUserid())) ;
+                if(CollectionUtils.isNotEmpty(list)) {
+                    dto.setExternalUserid(list.get(0).getNew_external_userid()) ;
+                }
+            }catch(Exception e) {
+                
+            }
             return dto;
         }
         

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java

@@ -788,7 +788,7 @@ public class WxStaffController extends WebBaseController {
         if (staffDTO != null) {
             String phoneNumber = staffDTO.getPhoneNumber();
             if (StringUtils.isBlank(phoneNumber)) {
-                logger.error("手机号为空,不进行查询,staffId：{}", staffId);
+                logger.error("成员表手机号为空,不进行查询,staffId：{}", staffId);
                 return ret;
             }
             List<ClerkDTO> clerkList = clerkNewService.listClerkByEnterpriseIdAndSearchAndClerkType(enterpriseIdList, storeIdList, phoneNumber);