Merge remote-tracking branch 'origin/developer' into developer

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

 package com.gic.haoban.manage.service.service.impl;
 
-import java.util.*;
-
+import com.alibaba.dubbo.config.annotation.Service;
 import com.alibaba.fastjson.JSONObject;
-import com.gic.haoban.manage.service.dao.mapper.StaffDepartmentRelatedMapper;
+import com.gic.haoban.common.utils.EntityUtil;
+import com.gic.haoban.common.utils.StringUtil;
+import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
+import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
 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.TabHaobanStaffClerkRelationMapper;
+import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
 import com.gic.haoban.manage.service.entity.TabHaobanStaff;
 import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
-import com.gic.haoban.manage.service.service.StaffClerkRelationService;
+import com.gic.haoban.manage.service.service.ExternalClerkRelatedService;
 import com.gic.member.api.dto.MemberDTO;
 import com.gic.member.api.service.MemberApiService;
 import com.gic.member.api.service.MemberService;
@@ -20,14 +24,10 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.alibaba.dubbo.config.annotation.Service;
-import com.gic.haoban.common.utils.EntityUtil;
-import com.gic.haoban.common.utils.StringUtil;
-import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
-import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
-import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper;
-import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
-import com.gic.haoban.manage.service.service.ExternalClerkRelatedService;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
 
 import static org.slf4j.LoggerFactory.getLogger;
 
@@ -92,7 +92,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
             }
             String enterpriseId = tabHaobanStaffClerkRelations.get(0).getEnterpriseId();
             List<String> statusFlagList = new ArrayList<>();
-            statusFlags.add("2");
+            statusFlagList.add("2");
             //删除的好友关系
             List<TabHaobanExternalClerkRelated> haobanExternalClerkRelatedList = mapper.listByExTernalUseridAndWxEnterpriseId(dto.getExternalUserid(), wxEnterpriseId, statusFlagList);
             for (TabHaobanExternalClerkRelated externalClerkRelated : haobanExternalClerkRelatedList) {

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

@@ -25,6 +25,7 @@ import com.gic.haoban.manage.service.dao.mapper.*;
 import com.gic.haoban.manage.service.entity.*;
 import com.gic.haoban.manage.service.entity.ext.MemberStaffRelExtDO;
 import com.gic.haoban.manage.service.pojo.QywxTagSyncInfoPojo;
+import com.gic.member.api.service.MemberApiService;
 import com.gic.mq.sdk.GicMQClient;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.wechat.api.dto.qywx.QywxNewExternalUseridDTO;
@@ -69,6 +70,8 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     private CheckQywxSettingApiService checkQywxSettingApiService;
     @Autowired
     private WxEnterpriseApiService wxEnterpriseApiService;
+    @Autowired
+    private MemberApiService memberApiService;
 
     /**
      * 查询导购好友关联
@@ -202,6 +205,8 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
         memberUnionidRelatedMapper.updateByPrimaryKeySelective(memberUnionidRelated);
         //同步标签
         pushTagSync(memberId, externalClerkRelated.getWxEnterpriseId(), enterpriseId);
+        //回调给会员，更新是否为企微好友
+        memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 1);
     }
 
     /**

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

@@ -443,7 +443,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             sendWelcome(dto, wxEnterpriseId, enterpriseId, staffId, clerkId, false);
             //同步好友标签
             pushTagSync(memberId, wxEnterpriseId, enterpriseId);
-            //回调给会员
+            //回调给会员，更新是否为企微好友
             memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 1);
         }
     }