Merge branch 'feat-0919' into developer

# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/ExternalClerkRelatedServiceImpl.java

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/config/Config.java

@@ -26,6 +26,8 @@ public class Config {
     private String hmLinkUrl;
     @Value("${qywx_hbzs_suite}")
     private String qywxHbzsSuite;
+    @Value("${addDelFriendEvent}")
+    private String addDelFriendEvent;
 
     public String getHmLinkUrl() {
         return hmLinkUrl;
@@ -90,4 +92,12 @@ public class Config {
     public void setQywxHbzsSuite(String qywxHbzsSuite) {
         this.qywxHbzsSuite = qywxHbzsSuite;
     }
+
+    public String getAddDelFriendEvent() {
+        return addDelFriendEvent;
+    }
+
+    public void setAddDelFriendEvent(String addDelFriendEvent) {
+        this.addDelFriendEvent = addDelFriendEvent;
+    }
 }

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

@@ -41,6 +41,7 @@ import com.gic.haoban.manage.api.dto.qdto.hm.WxUserAddLogQDTO;
 import com.gic.haoban.manage.api.enums.SecretTypeEnum;
 import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.MemberUnionidRelatedMapper;
+import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.StaffMapper;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanRepairExternalUserMapper;
@@ -93,6 +94,8 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
     private ClerkService clerkService;
     @Autowired
     private MemberEntranceApiService memberEntranceApiService;
+    @Autowired
+    private Config config;
 
     private WxEnterpriseService wxEnterpriseService ;
     @Autowired
@@ -105,7 +108,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
     private TabHaobanRepairExternalUserMapper tabHaobanRepairExternalUserMapper ;
     @Autowired
     private SecretSettingService secretSettingService ;
-    
+
     @Override
     public void insert(TabHaobanExternalClerkRelated related) {
         String clerkId = related.getClerkId();
@@ -197,6 +200,11 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
      * @param storeId
      */
     private void addDelFriendEvent(String unionId, String clerkId, String enterpriseId, String memberId, String storeId, Integer changeType) {
+        String addDelFriendEvent = config.getAddDelFriendEvent();
+        if (!addDelFriendEvent.contains(enterpriseId)) {
+            logger.info("非定制，无需广播通知");
+            return;
+        }
         //欧泊莱定制需求
         ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
         StoreDTO storeDTO = storeService.getStore(storeId);
@@ -343,7 +351,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
         }
         return null;
     }
-    
+
     @Override
     public void repairExternalUserId(String wxEnterpriseIds) {
         DingUtils.send("外部联系人修复消息,企业="+wxEnterpriseIds+",tranceid="+ProviderLocalTag.tag.get(), false);
@@ -444,7 +452,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
                             user.setRemark("企微查询不到");
                             addList.add(user) ;
                         }
-                        
+
                         if(CollectionUtils.isNotEmpty(selfList)) {
                             newExternalUseridList = null ;
                             if(null != cache) {
@@ -476,7 +484,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
                         }
                         this.tabHaobanRepairExternalUserMapper.batchInsert(addList) ;
                     }
-                    
+
                     // 错误的ID
                     if(CollectionUtils.isNotEmpty(errorList)) {
                         this.tabHaobanRepairExternalUserMapper.batchInsert(errorList) ;

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

@@ -631,6 +631,13 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
      * @param storeId
      */
     private void addDelFriendEvent(String unionId, String clerkId, String enterpriseId, String memberId, String storeId, Integer changeType) {
+        String addDelFriendEvent = config.getAddDelFriendEvent();
+        if (!addDelFriendEvent.contains(enterpriseId)) {
+            log.info("非定制，无需广播通知");
+            return;
+        }
+
+        log.info("欧泊莱定制：unionId:{},clerkId:{}",unionId,changeType);
         //欧泊莱定制需求
         ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
         StoreDTO storeDTO = storeService.getStore(storeId);