Merge branch 'feature/xgh/代开发调整25年' into 'developer'

Feature/xgh/代开发调整25年

See merge request !2422

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/QywxSyncTagFormatPojo.java

@@ -12,19 +12,19 @@ import java.util.Set;
  */
 public class QywxSyncTagFormatPojo implements Serializable {
     /**
-     * 企业微信与gic标签项对应map
+     * 企业微信标签值ID -> gic标签值ID
      */
     private Map<String, String> qywxToGicTagItemIdMap;
     /**
-     * gic与企业微信标签项对应map
+     * gic标签值ID -> 企业微信标签值ID
      */
     private Map<String, String> gicToQywxTagItemIdMap;
     /**
-     * 商户对应的企业微信标签列表
+     * gic企业ID ->  企业微信标签值ID LIST
      */
     private Map<String, Set<String>> entQywxTagKeysMap;
     /**
-     * 商户对应的gic标签列表
+     * gic企业ID -> gic标签值ID LIST
      */
     private Map<String, Set<String>> entGicTagItemIdMap;
 

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

@@ -131,7 +131,6 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
             }
             qw.setSelfAppid(wxEnterprise.getWxaAppid());
         }
-        qw.setHbWxaAppid(this.getHbAppid(qw, config.getAppid()));
         qw.setSelf3thSecret(this.getSecret(qw, config.getWxSuiteid()));
         // 只使用代开发（用于从自建转代开发）
         if(qw.getWxSecurityType()==6) {
@@ -147,6 +146,7 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
             qw.setAgentId(app.getAgentId());
             qw.setAgentName(app.getAgentName());
         }
+        qw.setHbWxaAppid(this.getHbAppid(qw, config.getAppid()));
         logger.info("企微所有corpid信息={}",JSON.toJSON(qw));
         return qw;
     }

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

@@ -489,7 +489,7 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
         //获取需要同步的标签
         QywxSyncTagFormatPojo syncTagFormat = listSyncTagItems(wxEnterpriseId);
         if (syncTagFormat == null) {
-            logger.info("没有需要同步的标签");
+            logger.info("没有和企微同步的标签={}",wxEnterpriseId);
             resp.setCode(2);
             resp.setMessage("没有要同步的标签");
             return resp;
@@ -586,6 +586,7 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
         if (MapUtils.isEmpty(relationMap)) {
             return null;
         }
+        // 标签项
         List<String> syncTagItemsIds = relationMap.keySet().stream().collect(Collectors.toList());
 
         //同步的标签项
@@ -614,12 +615,13 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
 
     @Override
     public ServiceResponse syncQywxTagToGicByExternalUserId(String wxEnterpriseId, String externalUserId, String wxUserId , String externalUserInfo) {
+        logger.info("staff打标同步gic={},{}",externalUserId,wxUserId);
         //刷新标签的时候不允许同步
         ServiceResponse resp = new ServiceResponse();
         //所有以及关联同步的标签
         QywxSyncTagFormatPojo syncTagFormatPojo = listSyncTagItems(wxEnterpriseId);
         if (syncTagFormatPojo == null) {
-            logger.info("没有需要同步的标签,wxUserId:{},externalUserId:{},wxId:{}", wxUserId, externalUserId, wxEnterpriseId);
+            logger.info("没有和企微同步的标签,wxUserId:{},externalUserId:{},wxId:{}", wxUserId, externalUserId, wxEnterpriseId);
             resp.setMessage("没有需要同步的标签");
             return resp;
         }
@@ -651,14 +653,14 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
         }
         Map<String, Set<String>> externalTagMap = getExternalTagMap(externalUseridInfo, wxEnterpriseId);
         if (MapUtils.isEmpty(externalTagMap)) {
-            logger.info("该用户没有不存在好友关系，获取不到关联导购打的标签，：externalUseridInfo:{}", externalUseridInfo);
+            logger.info("没有staff打的企微标签,externalUseridInfo={}", externalUseridInfo);
             resp.setMessage("该用户没有不存在好友关系，获取不到关联导购打的标签");
             return resp;
         }
         //当前操作用户企业打的标签
         Set<String> staffChangeTagKeys = externalTagMap.get(wxUserId);
         if (CollectionUtils.isEmpty(staffChangeTagKeys)) {
-            logger.info("该用户没有不存在好友关系，获取不到关联导购打的标签,wxUserId:{}", wxUserId);
+            logger.info("没有staff打的企微标签,staff-qwUserId={}", wxUserId);
             resp.setMessage("该用户没有不存在好友关系，获取不到关联导购打的标签");
             return resp;
         }
@@ -667,7 +669,7 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
         //获取该外部联系人的所有会员
         List<TabHaobanExternalClerkRelated> clerkRelateds = externalClerkRelatedService.listExternalByExternalUserid(wxEnterpriseId, externalUserId);
         if (CollectionUtils.isEmpty(clerkRelateds)) {
-            logger.info("该用户没关联对应的好友：{}", externalUserId);
+            logger.info("没有好友={}", externalUserId);
             resp.setMessage("该用户没关联对应的好友");
             return resp;
         }
@@ -708,7 +710,7 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
             Sets.SetView<String> entMemberNeedSetQywxKeys = Sets.intersection(staffHasSetTagKeys, entQywxSyncTagKeys);
             Set<String> saveTagIds = entMemberNeedSetQywxKeys.stream().map(qywxKey -> syncTagFormatPojo.getQywxToGicTagItemIdMap().get(qywxKey)).collect(Collectors.toSet());
             saveTagIds.addAll(noSyncTagItemIds);
-            logger.info("该企业会员需要打的标签：{}", JSONObject.toJSONString(entMemberNeedSetQywxKeys));
+            logger.info("会员需要打的企微标签：{}", JSONObject.toJSONString(entMemberNeedSetQywxKeys));
             //更新标签 会自动同步
             if (CollectionUtils.isEmpty(saveTagIds)) {
                 saveMemberTags(new HashSet<>(), clerkRelated.getEnterpriseId(), memberId, clerkRelated.getClerkId());

haoban-manage3-service/src/test/java/TagSyncTest.java

+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+
+/**
+ * 标签同步
+ */
+public class TagSyncTest {
+
+    public static void main(String[] args) {
+        JSONObject json = JSONObject.parseObject(getText()) ;
+        JSONArray list = json.getJSONObject("result").getJSONArray("tag_group") ;
+        System.out.println(JSONArray.toJSONString(list,true));
+    }
+
+
+    public  static String getText(){
+        try {
+            BufferedReader bw = new BufferedReader(new FileReader(new File("d:\\bq.txt"))) ;
+            StringBuilder sb = new StringBuilder() ;
+            while(true) {
+                String s =  bw.readLine() ;
+                if(StringUtils.isBlank(s)) {
+                    break ;
+                }else {
+                    String ss = new String(s.getBytes(),"UTF-8") ;
+                    sb.append(ss) ;
+                }
+            }
+            bw.close();
+            return sb.toString() ;
+        }catch(Exception e) {
+        }
+        return null ;
+    }
+
+}