删除代码

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ExternalClerkRelatedApiService.java

 package com.gic.haoban.manage.api.service;
 
+import java.util.List;
+import java.util.Map;
+
 import com.gic.api.base.commons.Page;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.ServiceResponse;
@@ -8,9 +11,6 @@ import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
 import com.gic.haoban.manage.api.dto.ExternalClerkRelatedShortInfoDTO;
 import com.gic.haoban.manage.api.dto.FriendMemberStatusDTO;
 
-import java.util.List;
-import java.util.Map;
-
 
 /**
  * Created by tgs on 2020/2/9.
@@ -266,4 +266,15 @@ public interface ExternalClerkRelatedApiService {
      */
     FriendMemberStatusDTO getFriendMemberStatus(String memberId,String enterpriseId);
     
+    
+    /**
+     * 
+    * @Title: initWxEnterpriseFrient
+    * @Description: 初始化整个商户的好友
+    * @author xugh
+    * @param wxEnterpriseId
+    * @throws
+     */
+    void initWxEnterpriseFriend(String wxEnterpriseId) ;
+
 }

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/EnterpriseController.java

 package com.gic.haoban.manage.web.controller;
 
-import cn.hutool.core.collection.CollectionUtil;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.authcenter.commons.dto.AuthcenterUserDetails;
 import com.gic.authcenter.commons.util.SessionContextUtil;
 import com.gic.commons.util.GlobalVar;
-import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.api.dto.EnterpriseAndUserDTO;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.dto.PowerStoreGroupDTO;
@@ -18,39 +41,34 @@ import com.gic.haoban.app.customer.service.api.service.QywxTagSyncApiService;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.PageResult;
 import com.gic.haoban.base.api.common.ServiceResponse;
-import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
-import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.common.utils.UuidUtil;
-import com.gic.haoban.manage.api.dto.*;
+import com.gic.haoban.manage.api.dto.BindStoreInfoDTO;
+import com.gic.haoban.manage.api.dto.DepartmentDTO;
+import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
+import com.gic.haoban.manage.api.dto.StoreOrGroupInfoDTO;
+import com.gic.haoban.manage.api.dto.StoreRangeInfoDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseRelationDetailDTO;
+import com.gic.haoban.manage.api.dto.YwWxEnterpriseDTO;
 import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
-import com.gic.haoban.manage.api.service.*;
+import com.gic.haoban.manage.api.service.DepartmentApiService;
+import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
+import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
+import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
+import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.WxEnterpriseBindQo;
 import com.gic.haoban.manage.web.vo.EnterpriseDetailVo;
 import com.gic.haoban.manage.web.vo.EnterpriseSearchVO;
 import com.gic.haoban.manage.web.vo.StoreGroupVo;
-import com.gic.haoban.task.manage.api.service.GroupSendOperateApiService;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.util.*;
-import java.util.stream.Collectors;
+import cn.hutool.core.collection.CollectionUtil;
 
 @RestController
 public class EnterpriseController extends WebBaseController {
@@ -76,8 +94,6 @@ public class EnterpriseController extends WebBaseController {
     @Autowired
     private QywxUserApiService qywxUserApiService;
     @Autowired
-    private GroupSendOperateApiService groupSendOperateApiService;
-    @Autowired
     private StoreGroupService storeGroupService ;
     @Autowired
     private MemberUnionidRelatedApiService memberUnionidRelatedApiService;
@@ -460,31 +476,6 @@ public class EnterpriseController extends WebBaseController {
         }
     }
 
-    /**
-     * desc: 发送会员关联消息
-     *
-     * @param wxEnterpriseId 微信企业id
-     * @return : {@link HaobanResponse}
-     * @author : YongEn
-     * @date : 2022/2/17
-     */
-    @RequestMapping("/send-stock-member-relation-message")
-    public HaobanResponse sendMass(String wxEnterpriseId) {
-        if (StringUtils.isEmpty(wxEnterpriseId)) {
-            return resultResponse(HaoBanErrCode.ERR_2);
-        }
-        // 处理缓存
-        String key = String.format(MEMBER_RELATE_ENT_OPE_KEY, wxEnterpriseId);
-        String cacheString = RedisUtil.getCache(key, String.class);
-        if (StringUtils.isNotEmpty(cacheString)) {
-            return resultResponse(HaoBanErrCode.ERR_40001);
-        }
-        RedisUtil.setCache(key, "1", 60 * 60 * 24 * 7L);
-        // 异步调用
-        groupSendOperateApiService.sendStockMemberRelationMessage(wxEnterpriseId);
-        return resultResponse(HaoBanErrCode.ERR_1);
-    }
-    
     // 绑定门店列表
     @RequestMapping("bind-store-list")
     public HaobanResponse bindStoreList(String wxEnterpriseId,String enterpriseId, String search, BasePageInfo basePageInfo) {

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/test/TestController.java

 package com.gic.haoban.manage.web.controller.test;
 
+import static org.slf4j.LoggerFactory.getLogger;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.commons.util.GICMQClientUtil;
@@ -8,28 +20,17 @@ import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.enums.QuartzEnum;
 import com.gic.haoban.manage.api.enums.SyncTaskTypeEnum;
 import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
+import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.TestApiService;
 import com.gic.haoban.manage.api.service.fee.HaobanQywxFeeApiService;
 import com.gic.haoban.manage.web.controller.WebBaseController;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
-import com.gic.haoban.task.manage.api.service.GroupSendOperateApiService;
 import com.gic.member.tag.api.service.MemberTagImportDealService;
 import com.gic.mq.sdk.GicMQClient;
 import com.gic.sharing.core.service.api.service.MqApiService;
 import com.task.allocation.qo.AllocationTaskQo;
 import com.task.allocation.qo.TaskAllocationComputed;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static org.slf4j.LoggerFactory.getLogger;
 
 /**
  * Created 2018/12/17.
@@ -55,12 +56,10 @@ public class TestController extends WebBaseController {
 
     @Autowired
     private MemberTagImportDealService memberTagImportDealService;
-
-    @Autowired
-    private GroupSendOperateApiService groupSendOperateApiService;
-
     @Autowired
     private HaobanQywxFeeApiService haobanQywxFeeApiService;
+    @Autowired
+    private ExternalClerkRelatedApiService externalClerkRelatedApiService ;
 
     /**
      * 创建定时器
@@ -224,7 +223,7 @@ public class TestController extends WebBaseController {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
         // 异步调用
-        groupSendOperateApiService.sendStockMemberRelationMessage(wxEnterpriseId);
+        this.externalClerkRelatedApiService.initWxEnterpriseFriend(wxEnterpriseId);
         return resultResponse(HaoBanErrCode.ERR_1);
     }
 

haoban-manage3-operation-web/src/main/webapp/WEB-INF/dubbo-haoban-manage3-operation-web.xml

@@ -66,8 +66,6 @@
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService"
 					 id="externalClerkRelatedApiService" timeout="30000"/>
 	<dubbo:reference interface="com.gic.wechat.api.service.qywx.QywxUserApiService" id="qywxUserApiService"/>
-	<dubbo:reference interface="com.gic.haoban.task.manage.api.service.GroupSendOperateApiService"
-					 id="groupSendOperateApiService" async="true"/>
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.QywxErrorLogApiService" id="qywxErrorLogApiService"/>
 
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.fee.HaobanQywxFeeApiService" id="haobanQywxFeeApiService"/>

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

 package com.gic.haoban.manage.service.service.out.impl;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.redisson.api.RRateLimiter;
+import org.redisson.api.RateIntervalUnit;
+import org.redisson.api.RateType;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
@@ -13,14 +32,29 @@ import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.base.api.common.errCode.HaoBanErrCodeCommon;
 import com.gic.haoban.common.utils.PageUtil;
-import com.gic.haoban.manage.api.dto.*;
+import com.gic.haoban.manage.api.dto.AlertMessageDTO;
+import com.gic.haoban.manage.api.dto.ClerkStaffWxUserDTO;
+import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
+import com.gic.haoban.manage.api.dto.ExternalClerkRelatedShortInfoDTO;
+import com.gic.haoban.manage.api.dto.FriendMemberStatusDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
 import com.gic.haoban.manage.api.enums.AlertTypeEnum;
+import com.gic.haoban.manage.api.enums.SyncTaskTypeEnum;
 import com.gic.haoban.manage.api.service.CheckQywxSettingApiService;
+import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
 import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.service.config.Config;
-import com.gic.haoban.manage.service.dao.mapper.*;
-import com.gic.haoban.manage.service.entity.*;
+import com.gic.haoban.manage.service.dao.mapper.ExternalUseridLogMapper;
+import com.gic.haoban.manage.service.dao.mapper.MemberUnionidRelatedMapper;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
+import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseMapper;
+import com.gic.haoban.manage.service.entity.MemberUnionidRelated;
+import com.gic.haoban.manage.service.entity.TabExternalUseridLog;
+import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
+import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
+import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
 import com.gic.haoban.manage.service.entity.ext.MemberStaffRelExtDO;
 import com.gic.haoban.manage.service.pojo.QywxTagSyncInfoPojo;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
@@ -32,20 +66,6 @@ import com.gic.wechat.api.dto.qywx.QywxNewExternalUseridDTO;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.redisson.api.RRateLimiter;
-import org.redisson.api.RateIntervalUnit;
-import org.redisson.api.RateType;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 @Service
 public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedApiService {
@@ -76,6 +96,8 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     private WxUserAddLogService wxUserAddLogService;
     @Autowired
     private WxEnterpriseService wxEnterpriseService ;
+    @Autowired
+    private DealSyncOperationApiService dealSyncOperationApiService ;
 
     /**
      * 查询会员在企业下的好友关系
@@ -596,4 +618,24 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     public int countFriendCountByClerkId(String wxEnterpriseId, String enterpriseId, String staffId, String clerkId) {
         return tabHaobanExternalClerkRelatedMapper.countByClerkId(wxEnterpriseId, enterpriseId, staffId, clerkId);
     }
+    
+    
+    @Override
+    public void initWxEnterpriseFriend(String wxEnterpriseId) {
+        log.info("刷新整个企业的好友开始={}", wxEnterpriseId);
+        String taskName = "刷新整个企微好友";
+        String taskId = dealSyncOperationApiService.createWxFriendTaskSingle(wxEnterpriseId, taskName, "-1", "管理员", SyncTaskTypeEnum.FRIEND_WX_ENTEPRISE.getType());
+        if (StringUtils.isNotBlank(taskId)) {
+            List<String> staffList = staffClerkRelationMapper.listByWxEnterpriseId(wxEnterpriseId);
+            if (CollectionUtils.isEmpty(staffList)) {
+                log.info("没有要刷新的：{},{}", wxEnterpriseId, staffList);
+                return;
+            }
+            staffList = staffList.stream().distinct().collect(Collectors.toList()) ;
+            log.info("staffList={}",JSON.toJSONString(staffList));
+            for (String staffId : staffList) {
+                this.dealSyncOperationApiService.dealWxFriendClerkSingle(taskId, staffId, staffId, wxEnterpriseId);
+            }
+        }
+    }
 }