Merge branch 'master' into developer

# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanExternalClerkRelatedMapper.java
#	haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanExternalClerkRelatedMapper.java

@@ -369,10 +369,11 @@ public interface TabHaobanExternalClerkRelatedMapper {
      */
     List<String> getByStoreIdAndStaffId(@Param("storeId") String storeId,
                                         @Param("staffId") String staffId);
-
-    List<String> listMemberAndClerk(@Param("memberIdList")List<String> memberIdList, @Param("clerkIdList")List<String> clerkIdList, @Param("enterpriseId")String enterpriseId);
-
     int getCountExternalClerk(@Param("wxEnterpriseId") String wxEnterpriseId,
                               @Param("staffId")  String staffId,
                               @Param("statusFlags") List<Integer> statusFlags);
+    List<String> listMemberAndClerk(@Param("memberIdList") List<String> memberIdList, @Param("clerkIdList") List<String> clerkIdList, @Param("enterpriseId") String enterpriseId);
+
+    int getCountByMemberId(@Param("memberId") String memberId);
+
 }
\ No newline at end of file

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

@@ -80,4 +80,7 @@ public interface ExternalClerkRelatedService {
 	 */
 	List<String> getByStoreIdAndStaffId(String storeId,String staffId);
 
+
+	int getCountByMemberId(String memberId);
+
 }

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

@@ -480,4 +480,9 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
     public List<String> getByStoreIdAndStaffId(String storeId, String staffId) {
         return mapper.getByStoreIdAndStaffId(storeId, staffId);
     }
+
+    @Override
+    public int getCountByMemberId(String memberId) {
+        return mapper.getCountByMemberId(memberId);
+    }
 }

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

@@ -87,21 +87,32 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
 
         int i = mapper.changeStatusByClerkId(clerkId, 0);
         String enterpriseId = clerkRelation.getEnterpriseId();
-        List<String> memberIds = externalClerkRelatedService.getByStoreIdAndStaffId(clerkRelation.getStoreId(), clerkRelation.getStaffId());
-        for (String memberId : memberIds) {
-            //解绑通知会员
-            memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 0);
-            memberApiService.updateMemberQywxEveryOccasion(enterpriseId, memberId, 0, new Date());
-        }
         //删除 并设置主门店
         clerkMainStoreRelatedService.delMainStore(clerkRelation.getStaffId(), clerkRelation.getStoreId(), clerkRelation.getWxEnterpriseId());
         //推入日志
         staffClerkBindLogService.pushToMq(clerkRelation.getStaffId(), optStaffId, BindTypeEnum.UNBIND.getVal(), channelCode, clerkRelation.getStaffClerkRelationId());
         //废弃活码
         hmClerkRelationApiService.delByClerkId(clerkId, enterpriseId, clerkRelation.getWxEnterpriseId(), channelCode);
+
+        List<String> memberIds = externalClerkRelatedService.getByStoreIdAndStaffId(clerkRelation.getStoreId(), clerkRelation.getStaffId());
+        delMemberQywxFlag(enterpriseId, memberIds);
         return i > 0;
     }
 
+
+    private void delMemberQywxFlag(String enterpriseId, List<String> memberIds) {
+        for (String memberId : memberIds) {
+            //解绑通知会员
+            int count = externalClerkRelatedService.getCountByMemberId(memberId);
+            if (count == 0) {
+                logger.info("通知会员 删除企微好友,该会员无任何好友关系，memberId:{}", memberId);
+                memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 0);
+            }
+            logger.info("通知会员 删除企微好友 memberId：{}", memberId);
+            memberApiService.updateMemberQywxEveryOccasion(enterpriseId, memberId, 0, new Date());
+        }
+    }
+
     @Override
     public boolean delBindByStoreIds(String wxEnterpriseId, Set<String> storeIds, String optStaffId, int channelCode) {
         if (CollectionUtils.isEmpty(storeIds)) {
@@ -127,11 +138,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
             hmClerkRelationApiService.delByClerkId(clerkRelation.getClerkId(), enterpriseId, wxEnterpriseId, channelCode);
             //删除好友通知会员
             List<String> memberIds = externalClerkRelatedService.getByStoreIdAndStaffId(clerkRelation.getStoreId(), clerkRelation.getStaffId());
-            for (String memberId : memberIds) {
-                //解绑通知会员
-                memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 0);
-                memberApiService.updateMemberQywxEveryOccasion(enterpriseId, memberId, 0, new Date());
-            }
+            delMemberQywxFlag(enterpriseId, memberIds);
         }
         return true;
     }

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

@@ -251,7 +251,7 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
         log.info("欧泊莱定制：推送会员,memberId：{},changeType:{}", memberId, changeType);
 
         //欧泊莱定制需求
-        ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
+        ClerkDTO clerkDTO = clerkService.getClerkByClerkIdNoStatus(clerkId);
         StoreDTO storeDTO = storeService.getStore(storeId);
         MemberDTO member = memberService.getMember(memberId);
         if (member == null) {

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

@@ -737,7 +737,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         }
         log.info("欧泊莱定制：推送会员,memberId：{},changeType:{}", memberId, changeType);
         //欧泊莱定制需求
-        ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
+        ClerkDTO clerkDTO = clerkService.getClerkByClerkIdNoStatus(clerkId);
         StoreDTO storeDTO = storeService.getStore(storeId);
         MemberDTO member = memberService.getMember(memberId);
         if (member == null) {

haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml

@@ -710,4 +710,12 @@
             </foreach>
     </select>
 
+    <select id="getCountByMemberId" resultType="java.lang.Integer" parameterType="java.lang.String">
+        select
+        count(*)
+        from tab_haoban_external_clerk_related
+        where
+        member_id = #{memberId} and status_flag = 1
+    </select>
+
 </mapper>
\ No newline at end of file