Merge branch 'feature-04-26' into developer

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

@@ -305,9 +305,18 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
         if (StringUtils.isBlank(mergeMemberId)) {
             //删除会员
             tabHaobanExternalClerkRelatedMapper.updateStatusByMemberId(memberId, enterpriseId);
+            int count = tabHaobanExternalClerkRelatedMapper.countByMemberId(memberId, enterpriseId);
+            if (count == 0) {
+                log.info("通知会员 删除会员后更新为非企微好友 memberId:{}", memberId);
+                //无好友关系
+                memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 0);
+            }
         } else {
             //合并会员
             tabHaobanExternalClerkRelatedMapper.updateMemberIdByMemberId(mergeMemberId, memberId, enterpriseId);
+            //回调给会员，更新是否为企微好友
+            log.info("通知会员 合并会员后更新为企微好友,memberId:{}", memberId);
+            memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 1);
         }
     }