Merge branch 'master' into developer

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

@@ -87,6 +87,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
 
         int i = mapper.changeStatusByClerkId(clerkId, 0);
         String enterpriseId = clerkRelation.getEnterpriseId();
+        List<String> memberIds = externalClerkRelatedService.getByStoreIdAndStaffId(clerkRelation.getStoreId(), clerkRelation.getStaffId());
         //删除 并设置主门店
         clerkMainStoreRelatedService.delMainStore(clerkRelation.getStaffId(), clerkRelation.getStoreId(), clerkRelation.getWxEnterpriseId());
         //推入日志
@@ -94,7 +95,6 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
         //废弃活码
         hmClerkRelationApiService.delByClerkId(clerkId, enterpriseId, clerkRelation.getWxEnterpriseId(), channelCode);
 
-        List<String> memberIds = externalClerkRelatedService.getByStoreIdAndStaffId(clerkRelation.getStoreId(), clerkRelation.getStaffId());
         delMemberQywxFlag(enterpriseId, memberIds);
         return i > 0;
     }
@@ -125,20 +125,24 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
             return true;
         }
 
+        for (TabHaobanStaffClerkRelation staffClerkRelation : needUnbind) {
+            String enterpriseId = staffClerkRelation.getEnterpriseId();
+            //删除好友通知会员
+            List<String> memberIds = externalClerkRelatedService.getByStoreIdAndStaffId(staffClerkRelation.getStoreId(), staffClerkRelation.getStaffId());
+            delMemberQywxFlag(enterpriseId, memberIds);
+        }
+
+        List<String> need = needUnbind.stream().map(tab -> tab.getStaffClerkRelationId()).collect(Collectors.toList());
         //清除绑定
         mapper.delByStoreIds(storeIds);
         //删除主门店
         clerkMainStoreRelatedService.delMainStoreByStoreIds(storeIds);
-        List<String> need = needUnbind.stream().map(tab -> tab.getStaffClerkRelationId()).collect(Collectors.toList());
         //放入队列
         staffClerkBindLogService.pushToMqBatch(optStaffId, BindTypeEnum.UNBIND.getVal(), channelCode, need);
         for (TabHaobanStaffClerkRelation clerkRelation : needUnbind) {
             //废弃活码
             String enterpriseId = clerkRelation.getEnterpriseId();
             hmClerkRelationApiService.delByClerkId(clerkRelation.getClerkId(), enterpriseId, wxEnterpriseId, channelCode);
-            //删除好友通知会员
-            List<String> memberIds = externalClerkRelatedService.getByStoreIdAndStaffId(clerkRelation.getStoreId(), clerkRelation.getStaffId());
-            delMemberQywxFlag(enterpriseId, memberIds);
         }
         return true;
     }