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

删除好友事件

See merge request !1360

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

@@ -1119,25 +1119,11 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     private void deleteToEvent(String wxEnterpriseId, String externalUserId) {
         GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
         try {
-            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);
-                }
-            }
+            JSONObject msgBody = new JSONObject();
+            msgBody.put("wxEnterpriseId", wxEnterpriseId);
+            msgBody.put("externalUserId", externalUserId);
+            clientInstance.sendMessage("dealQywxExternalUserEvent",msgBody.toJSONString());
+            log.info("删除外部联系人事件={}",msgBody.toJSONString());
         } catch (Exception e) {
             log.info("删除外部联系：{}", e.getMessage(), e);
         }
@@ -1167,7 +1153,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     /**
      * 创建企业群发, 支出素材批量发送
      * @param wxEnterpriseId : 微信企业id
-     * @param userId         : 用户id
      * @param extendUserList : 发送的用户id
      * @param materialIdList : 素材id列表
      * @return : 返回群发执行结果