Merge branch 'feature-积分商城迁移' into 'master'

删除好友事件

See merge request !1358

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

@@ -1119,18 +1119,25 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     private void deleteToEvent(String wxEnterpriseId, String externalUserId) {
         GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
         try {
-            JSONObject msgBody = new JSONObject();
-            msgBody.put("wxEnterpriseId", wxEnterpriseId);
-            msgBody.put("externalUserId", externalUserId);
-            String event = "deleteQwExternalUserEvent";
-            String topic = "member";
-            SubscribeMessageDTO subscribeMessageDTO = new SubscribeMessageDTO();
-            subscribeMessageDTO.setEvent(event);
-            subscribeMessageDTO.setTopic(topic);
-            subscribeMessageDTO.setMsgBody(msgBody.toJSONString());
-            String msg =  JSONObject.toJSONString(subscribeMessageDTO) ;
-            log.info("删除外部联系人事件={}",msg);
-            clientInstance.sendMessage("dealQywxExternalUserEvent",msg);
+            List<TabHaobanWxEnterpriseRelated> list = this.wxEnterpriseRelatedService.getByWxEnterpriseId(wxEnterpriseId) ;
+            if(CollectionUtils.isNotEmpty(list)) {
+                for (TabHaobanWxEnterpriseRelated item : list) {
+                    JSONObject msgBody = new JSONObject();
+                    msgBody.put("wxEnterpriseId", wxEnterpriseId);
+                    msgBody.put("externalUserId", externalUserId);
+                    msgBody.put("enterpriseId" , item.getEnterpriseId()) ;
+                    String event = "deleteQwExternalUserEvent";
+                    String topic = "member";
+                    SubscribeMessageDTO subscribeMessageDTO = new SubscribeMessageDTO();
+                    subscribeMessageDTO.setEnterpriseId(item.getEnterpriseId());
+                    subscribeMessageDTO.setEvent(event);
+                    subscribeMessageDTO.setTopic(topic);
+                    subscribeMessageDTO.setMsgBody(msgBody.toJSONString());
+                    String msg =  JSONObject.toJSONString(subscribeMessageDTO) ;
+                    log.info("删除外部联系人事件={}",msg);
+                    clientInstance.sendMessage("dealQywxExternalUserEvent",msg);
+                }
+            }
         } catch (Exception e) {
             log.info("删除外部联系：{}", e.getMessage(), e);
         }