Merge branch 'feature/login-token' into developer

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

@@ -378,7 +378,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             return;
         }
         String staffId = staff.getStaffId();
-        dto.setWxUserId(staff.getWxUserId());
+        String staffWxUserId = staff.getWxUserId();
+        log.info("新增外部联系人,staff.getWxUserId():{}", staffWxUserId);
+        dto.setWxUserId(staffWxUserId);
         TabHaobanClerkMainStoreRelated mainStoreRelated = clerkMainStoreRelatedService.getMainStoreByStaffId(staffId, wxEnterpriseId);
         if (mainStoreRelated == null) {
             log.info("【新增外部联系人】主门店为空:{}", staffId);

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

@@ -19,6 +19,7 @@ import com.gic.haoban.manage.service.entity.*;
 import com.gic.haoban.manage.service.pojo.QywxSyncTagFormatPojo;
 import com.gic.haoban.manage.service.service.ExternalClerkRelatedService;
 import com.gic.haoban.manage.service.service.QywxTagService;
+import com.gic.haoban.manage.service.service.StaffService;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.gic.member.api.dto.MemberTagDTO;
 import com.gic.member.api.service.MemberTagService;
@@ -80,6 +81,8 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
 
     @Autowired
     private MemberTagItemApiService memberTagItemApiService;
+    @Autowired
+    private StaffService staffService;
 
     @Override
     public void pullQywxTag(String wxEnterpriseId) {
@@ -520,7 +523,7 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
             resp.setMessage("getExternalUseridInfo接口次数限制");
             return resp;
         }
-        Map<String, Set<String>> externalTagMap = getExternalTagMap(externalUseridInfo);
+        Map<String, Set<String>> externalTagMap = getExternalTagMap(externalUseridInfo, wxEnterpriseId);
         if (null == externalTagMap) {
             logger.info("没有好友需要同步");
             resp.setCode(5);
@@ -629,7 +632,7 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
             resp.setMessage("限制次数");
             return resp;
         }
-        Map<String, Set<String>> externalTagMap = getExternalTagMap(externalUseridInfo);
+        Map<String, Set<String>> externalTagMap = getExternalTagMap(externalUseridInfo, wxEnterpriseId);
 
         //当前操作用户企业打的标签
         Set<String> staffChangeTagKeys = externalTagMap.get(wxUserId);
@@ -719,7 +722,7 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
      * @param externalUseridInfo
      * @return
      */
-    private Map<String, Set<String>> getExternalTagMap(String externalUseridInfo) {
+    private Map<String, Set<String>> getExternalTagMap(String externalUseridInfo, String wxEnterpriseId) {
         Map<String, Set<String>> ret = new HashMap<>();
         JSONObject jsonObject = JSONObject.parseObject(externalUseridInfo);
 
@@ -732,6 +735,11 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
         for (int i = 0; i < followUser.size(); i++) {
             JSONObject midUser = followUser.getJSONObject(i);
             String wxUserId = midUser.getString("userid");
+            //做兼容
+            TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
+            if (staff != null) {
+                wxUserId = staff.getWxUserId();
+            }
             Set<String> midTagIds = new HashSet<>();
             if (!midUser.containsKey("tags")) {
                 ret.put(wxUserId, midTagIds);