Merge branch 'developer' into 'master'

加好友队列

See merge request !960

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

@@ -399,7 +399,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         return null;
     }
     // 加好友量大的迁移到mq2
-    int maxCount = 2 ;
+    int maxCount = 800 ;
     private boolean mqCheck(QwFrientNoticeDTO dto) {
         boolean flag = false ;
         Object obj = RedisUtil.getCache("dealQywxExternalUserMq2") ;
@@ -412,12 +412,18 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                 return flag ;
             }
         }
+        if(null != obj && obj.toString().equals("0")) {
+            return false ;
+        }
         TabHaobanWxEnterprise wxEnterprise = this.wxEnterpriseService.getEnterpriseBycorpId(corpid) ;
         if(null != wxEnterprise) {
             String wxEnterpriseId = wxEnterprise.getWxEnterpriseId() ;
             flag = this.needToMq2(wxEnterpriseId) ;
             if(!flag) {
                 long times = this.getTimes(wxEnterpriseId) ;
+                if("wp59NLDQAAtTbif_SxAixUQVqMld4vug".equals(corpid)) {
+                    maxCount = 2 ;
+                }
                 if(times>maxCount) {
                     if(!needToMq2(wxEnterpriseId)) {
                         log.info("加好友计数发送告警,id={}",wxEnterpriseId);