Merge branch 'developer' into feature-haoban-role

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

@@ -41,20 +41,31 @@ public interface StaffClerkRelationApiService {
 
     /**
      * 审核绑定
+     *
      * @param staffClerkRelation
      * @param optStaffId
      * @param channelCode
      */
     void delAndInsert(StaffClerkRelationDTO staffClerkRelation, String optStaffId, int channelCode);
 
+
     /**
-     * 解绑
-     *
-     * @param storeId
-     * @param clerkCode
+     * 解绑导购
+     * @param staffId
+     * @param clerkId
+     * @param channelCode
      * @return
      */
-    void  delByStoreIdAndCode(String storeId, String clerkCode);
+    boolean unbindByStaffAndClerkId(String staffId, String clerkId, int channelCode);
+
+    /**
+     * 解绑门店
+     * @param wxEnterpriseId
+     * @param storeId
+     * @param staffId
+     * @param channelCode
+     */
+    void delBindByStoreId(String wxEnterpriseId,String storeId, String staffId,int channelCode);
 
 
     StaffClerkRelationDTO getOneByClerkId(String clerkId);
@@ -70,15 +81,6 @@ public interface StaffClerkRelationApiService {
     List<StaffClerkRelationDTO> listByStoreId(String storeId);
 
     /**
-     * 解绑
-     *
-     * @param staffId 操作人
-     * @param clerkId
-     * @return
-     */
-    boolean unbindByStaffAndClerkId(String staffId, String clerkId);
-
-    /**
      * 查询导购信息
      *
      * @param clerkId
@@ -93,7 +95,7 @@ public interface StaffClerkRelationApiService {
      * @return
      */
     StaffClerkRelationDTO getByClerkId(String clerkId);
-    
+
     StaffClerkRelationDTO getByClerkIdForWxUserId(String clerkId);
 
     /**
@@ -104,13 +106,6 @@ public interface StaffClerkRelationApiService {
     List<StaffClerkRelationDTO> listByEnterpriseIdAndStaffid(String enterpriseId, String staffid);
 
     /**
-     * 删除关联关系
-     *
-     * @param clerkId
-     */
-    void delByClerkId(String clerkId);
-
-    /**
      * 搜索查询列表
      *
      * @param wxEnterpriseId
@@ -171,7 +166,7 @@ public interface StaffClerkRelationApiService {
      * @author mozhu
      * @date 2022-06-20 22:46:46
      */
-    List<StaffClerkRelationDTO> listByStaffId(String wxEnterpriseId,String staffId);
+    List<StaffClerkRelationDTO> listByStaffId(String wxEnterpriseId, String staffId);
 
     /**
      * 通过职员id 查询职员id列表
@@ -182,7 +177,7 @@ public interface StaffClerkRelationApiService {
      * @author mozhu
      * @date 2022-07-07 17:28:01
      */
-    List<StaffClerkRelationDTO> listClerkIdConcatFlagByClerkIds(List<String> clerkIds,String wxEnterpriseId);
+    List<StaffClerkRelationDTO> listClerkIdConcatFlagByClerkIds(List<String> clerkIds, String wxEnterpriseId);
 
 
     /**
@@ -194,19 +189,18 @@ public interface StaffClerkRelationApiService {
      * @date 2022-07-12 18:57:15
      */
     void clerkStoreMoveDel(String param);
-    
-    /**
-     * 
-    * @Title: getCanAddHmCount
-    * @Description: 获取能创建活码的导购数量
-    * @author xugh
-    * @param enterpriseId
-    * @param wxEnterpriseId
-    * @return
-    * @throws
-     */
-    int getCanAddHmCount(String enterpriseId , String wxEnterpriseId , String clerkId) ;
-    
+
+    /**
+     * @param enterpriseId
+     * @param wxEnterpriseId
+     * @return
+     * @throws
+     * @Title: getCanAddHmCount
+     * @Description: 获取能创建活码的导购数量
+     * @author xugh
+     */
+    int getCanAddHmCount(String enterpriseId, String wxEnterpriseId, String clerkId);
+
     List<String> listStaffIdByWxEnterpriseId(String wxEnterpriseId);
 
 }

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

 package com.gic.haoban.manage.service.dao.mapper;
 
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
 import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
 import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
 import com.github.pagehelper.Page;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
 
 public interface TabHaobanExternalClerkRelatedMapper {
 
@@ -146,7 +145,7 @@ public interface TabHaobanExternalClerkRelatedMapper {
     List<TabHaobanExternalClerkRelated> listByMemberIdAndWxEnterpriseId(@Param("memberId") String memberId,
                                                                         @Param("wxEnterpriseId") String wxEnterpriseId,
                                                                         @Param("enterpriseId") String enterpriseId);
-    
+
     /**
      * 查询会员在企业下的好友关系
      *
@@ -156,8 +155,9 @@ public interface TabHaobanExternalClerkRelatedMapper {
      * @return
      */
     List<ExternalClerkRelatedDTO> listByMemberIdList(@Param("memberIdList") List<String> memberIdList,
-                                                                        @Param("wxEnterpriseId") String wxEnterpriseId,
-                                                                        @Param("enterpriseId") String enterpriseId);
+                                                     @Param("wxEnterpriseId") String wxEnterpriseId,
+                                                     @Param("enterpriseId") String enterpriseId);
+
     /**
      * 获取最新的最近的外部联系人
      *
@@ -270,7 +270,7 @@ public interface TabHaobanExternalClerkRelatedMapper {
      * 根据企业id分页
      *
      * @param wxEnterpriseId 企业标识
-     * @return {@link List<TabHaobanWxEnterprise> }
+     * @return {@link List<TabHaobanExternalClerkRelated> }
      * @author mozhu
      * @date 2021-12-13 14:59:03
      */
@@ -295,7 +295,7 @@ public interface TabHaobanExternalClerkRelatedMapper {
      *
      * @param wxEnterpriseId 企业id
      * @param enterpriseId   商户id
-     * @param staffId       企业微信导购账号
+     * @param staffId        企业微信导购账号
      * @param clerkId        导购id
      * @return
      */
@@ -315,10 +315,11 @@ public interface TabHaobanExternalClerkRelatedMapper {
      * 查询所有好友关系
      *
      * @param wxEnterpriseId wx企业标识
-     * @param staffId       wx用户id
+     * @param staffId        wx用户id
      * @return {@link List}<{@link TabHaobanExternalClerkRelated}>
      */
-    List<TabHaobanExternalClerkRelated> getByWxUserIdAndWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffId") String staffId);
+    List<TabHaobanExternalClerkRelated> getByWxUserIdAndWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId,
+                                                                       @Param("staffId") String staffId);
 
 
     /**
@@ -354,7 +355,18 @@ public interface TabHaobanExternalClerkRelatedMapper {
      */
     int countByMemberId(@Param("memberId") String memberId,
                         @Param("enterpriseId") String enterpriseId);
-    
+
     List<TabHaobanExternalClerkRelated> listPageByWxenterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId,
-            @Param("startItem") int startItem , @Param("pageSize") int pageSize );
+                                                                 @Param("startItem") int startItem, @Param("pageSize") int pageSize);
+
+
+    /**
+     * 获取所有的好友会员id
+     *
+     * @param storeId 存储id
+     * @param staffId 员工id
+     * @return {@link List}<{@link String}>
+     */
+    List<String> getByStoreIdAndStaffId(@Param("storeId") String storeId,
+                                        @Param("staffId") String staffId);
 }
\ No newline at end of file

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

@@ -26,8 +26,6 @@ public interface ExternalClerkRelatedService {
 	 */
 	void delByUserIdAndExternalUserIdBatch(String wxEnterpriseId, String staffId, List<String> externalUserids);
 
-	void delByClerkIdAndStaffId(String clerkId, String staffId);
-
     void delByStoreIdAndStaffId(String storeId, String staffId);
 
 	void delByStoreIds(Collection<String> storeIds);
@@ -38,7 +36,7 @@ public interface ExternalClerkRelatedService {
 
 	TabHaobanExternalClerkRelated getByParams(String staffId, String wxEnterpriseId, String name, String createTime);
 
-	List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserId(String externalUserid, String staffId);
+	List<TabHaobanExternalClerkRelated> listByExternalUseridAndWxUserId(String externalUserid, String staffId);
 
 	List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserIdAllStatus(String wxEnterpriseId, String externalUserid, String wxUserId);
 
@@ -73,4 +71,13 @@ public interface ExternalClerkRelatedService {
 
     void repairExternalUserId(String wxEnterpriseId);
 
+	/**
+	 * 获取所有的好友会员id
+	 *
+	 * @param storeId 存储id
+	 * @param staffId 员工id
+	 * @return {@link List}<{@link String}>
+	 */
+	List<String> getByStoreIdAndStaffId(String storeId,String staffId);
+
 }

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

@@ -15,7 +15,7 @@ public interface StaffClerkRelationService {
 	List<StaffClerkRelationDTO> listBindCodeByStaffId(List<String> enterpriseIdList, String staffId);
 
 	/**
-	 * 删除绑定
+	 * 解绑-删除绑定（导购级别）
 	 *
 	 * @param clerkId
 	 * @return
@@ -23,7 +23,7 @@ public interface StaffClerkRelationService {
 	boolean delBind(String clerkId, String optStaffId, int channelCode);
 
 	/**
-	 * 删除绑定
+	 * 解绑-删除绑定（门店级别）
 	 *
 	 * @param wxEnterpriseId 可以不传
 	 * @param storeIds

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

@@ -66,6 +66,10 @@ public class ClerkMainStoreRelatedServiceImpl implements ClerkMainStoreRelatedSe
         logger.info("切换主门店-刷新企业微信好友：{},{}", staffId, storeId);
         //主门店切换需要刷新企业微信好友
         TabHaobanStaff staff = staffService.selectById(staffId);
+        if (staff == null) {
+            logger.info("员工不存在：{}",staffId);
+            return;
+        }
         String taskName = "自动刷新企业微信好友（" + staff.getStaffName() + "）";
         String taskId = dealSyncOperationApiService.createWxFriendTaskSingle(wxEnterpriseId, taskName, staffId, staff.getStaffName(), SyncTaskTypeEnum.FRIEND_SINGLE.getType());
         if (StringUtils.isBlank(taskId)) {

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

@@ -239,11 +239,6 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
     }
 
     @Override
-    public void delByClerkIdAndStaffId(String clerkId, String staffId) {
-        mapper.delByClerkIdAndStaffId(clerkId, staffId);
-    }
-
-    @Override
     public void delByStoreIdAndStaffId(String storeId, String staffId) {
         mapper.delByStoreIdAndStaffId(storeId, staffId);
     }
@@ -258,7 +253,6 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
         if (staffIds != null && !staffIds.isEmpty()) {
             mapper.cleanStaffRelated(wxEnterpriseId, staffIds);
         }
-
     }
 
     @Override
@@ -275,7 +269,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
     }
 
     @Override
-    public List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserId(String externalUserid, String staffId) {
+    public List<TabHaobanExternalClerkRelated> listByExternalUseridAndWxUserId(String externalUserid, String staffId) {
         return mapper.listByExTernalUseridAndWxUserId(externalUserid, staffId, 1);
     }
 
@@ -474,4 +468,9 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
             }
         }
     }
+
+    @Override
+    public List<String> getByStoreIdAndStaffId(String storeId, String staffId) {
+        return mapper.getByStoreIdAndStaffId(storeId, staffId);
+    }
 }

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

@@ -20,6 +20,7 @@ import com.gic.haoban.manage.service.entity.MemberClerkChatConfig;
 import com.gic.haoban.manage.service.entity.TabHaobanStaff;
 import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
 import com.gic.haoban.manage.service.service.*;
+import com.gic.member.api.service.MemberApiService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.collections.CollectionUtils;
@@ -60,6 +61,8 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
     private HmClerkRelationApiService hmClerkRelationApiService;
     @Autowired
     private WxEnterpriseService wxEnterpriseService;
+    @Autowired
+    private MemberApiService memberApiService;
 
     @Override
     public List<StaffClerkRelationDTO> listBindCode(String enterpriseId, Set<String> clerkCodeList) {
@@ -80,17 +83,20 @@ 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());
-        boolean b = i >= 0;
-        if (b) {
-            //推入日志
-            staffClerkBindLogService.pushToMq(clerkRelation.getStaffId(), optStaffId, BindTypeEnum.UNBIND.getVal(), channelCode, clerkRelation.getStaffClerkRelationId());
-
-            //废弃活码
-            hmClerkRelationApiService.delByClerkId(clerkId, clerkRelation.getEnterpriseId(), clerkRelation.getWxEnterpriseId(), channelCode);
-        }
-        return b;
+        //推入日志
+        staffClerkBindLogService.pushToMq(clerkRelation.getStaffId(), optStaffId, BindTypeEnum.UNBIND.getVal(), channelCode, clerkRelation.getStaffClerkRelationId());
+        //废弃活码
+        hmClerkRelationApiService.delByClerkId(clerkId, enterpriseId, clerkRelation.getWxEnterpriseId(), channelCode);
+        return i > 0;
     }
 
     @Override
@@ -102,21 +108,27 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
         List<TabHaobanStaffClerkRelation> needUnbind = mapper.listBindByStoreIds(wxEnterpriseId, storeIds);
         if (CollectionUtils.isEmpty(needUnbind)) {
             logger.info("没有门店绑定了需要解绑的：{}", wxEnterpriseId);
+            return true;
         }
 
         //清除绑定
         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) {
             //废弃活码
-            hmClerkRelationApiService.delByClerkId(clerkRelation.getClerkId(), clerkRelation.getEnterpriseId(), wxEnterpriseId, channelCode);
+            String enterpriseId = clerkRelation.getEnterpriseId();
+            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());
+            }
         }
         return true;
     }

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

@@ -171,12 +171,6 @@ public class StoreRangeServiceImpl implements StoreRangeService {
      * @param addStoreIds
      */
     private void dealStoreRelation(List<TabStoreRelation> storeRelations, String enterpriseId, Set<String> delStoreIds, Set<String> addStoreIds) {
-
-//        //先删除 后新增
-//        tabHaobanStoreRelationMapper.deleteAllStoreRalation(enterpriseId);
-//        //批量插入
-//        insertStoreRelationBatch(storeRelations);
-
         //先删除 后新增
         if (CollectionUtils.isNotEmpty(delStoreIds)) {
             logger.info("批量删除门店：{}", JSONObject.toJSONString(delStoreIds));

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

@@ -202,15 +202,11 @@ public class AuditApiServiceImpl implements AuditApiService {
             if (StringUtils.isNotBlank(batchId)) {
                 insertBatchLog(batchId, AuditRsultType.success.getCode(), tab);
             }
-            //解绑日志
-            StaffClerkRelationDTO relationDTO = staffClerkRelationApiService.getByClerkId(obj.getClerkId());
-            if (null != relationDTO) {
-                staffClerkRelationApiService.pushToBindLog(relationDTO.getStaffId(), optStaffId, BindTypeEnum.UNBIND.getVal(), ChannelCodeEnum.SELF_UNBIND.getCode(), relationDTO.getStaffClerkRelationId());
-            }
-            staffClerkRelationApiService.delByClerkId(obj.getClerkId());
+            staffClerkRelationApiService.unbindByStaffAndClerkId(optStaffId,obj.getClerkId(),ChannelCodeEnum.AUDIT_UNBIND.getCode());
             staffDepartmentRelatedApiService.sendClerkDel(obj.getClerkName(), obj.getClerkCode(), tab.getCommitStoreId(), 1, "");
         } else if (auditType == AuditType.CLERK_UNBIND.getCode()) {
             //解绑申请，无需审核，直接通过
+            logger.info("解绑申请，无需审核，直接通过");
         }
         tab.setAuditStatus(1);
         auditMapper.updateByPrimaryKeySelective(tab);

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

@@ -180,24 +180,35 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         DealQywxExternalUserPojo externalUserPojo = JSONObject.parseObject(params, DealQywxExternalUserPojo.class);
         QwFrientNoticeDTO qwFrientNoticeDTO = externalUserPojo.getData();
         int type = externalUserPojo.getType();
+        String wxUserId = qwFrientNoticeDTO.getWxUserId();
         MemberUnionidRelatedDTO memberUnionidRelatedDTO = EntityUtil.changeEntityByJSON(MemberUnionidRelatedDTO.class, qwFrientNoticeDTO);
         if (type == DealQywxExternalUserPojo.DealType.add.getType()) {
-            this.addMemberUnionidRelatedNew(memberUnionidRelatedDTO, qwFrientNoticeDTO.getWxUserId());
+            this.addMemberUnionidRelatedNew(memberUnionidRelatedDTO, wxUserId);
         } else if (type == DealQywxExternalUserPojo.DealType.edit.getType()) {
-            this.editMemberUnionidRelatedProcess(memberUnionidRelatedDTO, qwFrientNoticeDTO.getWxUserId());
+            this.editMemberUnionidRelatedProcess(memberUnionidRelatedDTO, wxUserId);
         } else if (type == DealQywxExternalUserPojo.DealType.del.getType()) {
             String changeType = qwFrientNoticeDTO.getChangeType();
             //欧泊莱定制
             if ("del_follow_user".equals(changeType)) {
-                log.info("会员删除导购：{}", JSON.toJSONString(memberUnionidRelatedDTO));
-                List<TabHaobanExternalClerkRelated> tabHaobanExternalClerkRelatedList = externalClerkRelatedService.listByExTernalUseridAndWxUserId(memberUnionidRelatedDTO.getExternalUserid(), memberUnionidRelatedDTO.getStaffId());
+                log.info("会员删除导购");
+                String corpId = memberUnionidRelatedDTO.getCorpid();
+                TabHaobanWxApplication tabHaobanWxApplication = wxApplicationMapper.selectByCorpId(corpId, null);
+                if (tabHaobanWxApplication == null) {
+                    log.info("查询tab_haoban_wx_application为空：{}", corpId);
+                    return;
+                }
+                String wxEnterpriseId = tabHaobanWxApplication.getWxEnterpriseId();
+                memberUnionidRelatedDTO.setWxEnterpriseId(wxEnterpriseId);
+                TabHaobanStaff staff = this.staffMapper.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
+                String staffId = staff.getStaffId();
+                memberUnionidRelatedDTO.setStaffId(staffId);
+                List<TabHaobanExternalClerkRelated> tabHaobanExternalClerkRelatedList = externalClerkRelatedService.listByExternalUseridAndWxUserId(memberUnionidRelatedDTO.getExternalUserid(), memberUnionidRelatedDTO.getStaffId());
                 if (CollectionUtils.isEmpty(tabHaobanExternalClerkRelatedList)) {
                     log.error("无好友记录");
                     return;
                 }
                 TabHaobanExternalClerkRelated related = tabHaobanExternalClerkRelatedList.get(0);
                 String enterpriseId = related.getEnterpriseId();
-                String wxEnterpriseId = related.getWxEnterpriseId();
                 //添加日志
                 WxUserAddLogQDTO wxUserAddLogQDTO = new WxUserAddLogQDTO();
                 wxUserAddLogQDTO.setWxEnterpriseId(wxEnterpriseId);
@@ -213,13 +224,14 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                 addDelFriendEvent(related.getUnionid(), related.getClerkId(), wxEnterpriseId,enterpriseId, related.getMemberId(), related.getStoreId(), 0);
                 return;
             }
-            this.delMemberUnionidRelatedProcess(memberUnionidRelatedDTO, qwFrientNoticeDTO.getWxUserId());
+            log.info("导购删除好友");
+            this.delMemberUnionidRelatedProcess(memberUnionidRelatedDTO, wxUserId);
         }
     }
 
     @Override
     public List<MemberStoreDTO> listByExTernalUseridAndWxUserId(String externalUserid, String staffId, String storeId) {
-        List<TabHaobanExternalClerkRelated> list = externalClerkRelatedService.listByExTernalUseridAndWxUserId(externalUserid, staffId);
+        List<TabHaobanExternalClerkRelated> list = externalClerkRelatedService.listByExternalUseridAndWxUserId(externalUserid, staffId);
         List<MemberStoreDTO> result = new ArrayList<>();
         if (CollectionUtil.isEmpty(list)) {
             return null;
@@ -1791,7 +1803,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         Set<String> externalUserIdList = list.stream().map(external -> external.getExternalUserId()).collect(Collectors.toSet());
         Sets.SetView<String> delExternalUserIds = Sets.difference(new HashSet<>(externalUserIds), externalUserIdList);
         if (CollectionUtils.isEmpty(delExternalUserIds)) {
-            log.info("没有需要删除的外部联系人:{},{}", staffId);
+            log.info("没有需要删除的外部联系人:{}", staffId);
             return;
         }
         //删除成员与union的关联关系

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

@@ -10,10 +10,7 @@ import com.gic.haoban.app.customer.service.api.service.InnerApiService;
 import com.gic.haoban.base.api.common.Constant;
 import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.manage.api.dto.*;
-import com.gic.haoban.manage.api.enums.AppPageType;
-import com.gic.haoban.manage.api.enums.NoticeMessageTypeEnum;
-import com.gic.haoban.manage.api.enums.SecretTypeEnum;
-import com.gic.haoban.manage.api.enums.WxEditType;
+import com.gic.haoban.manage.api.enums.*;
 import com.gic.haoban.manage.api.service.MessageApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
@@ -303,7 +300,7 @@ public class MessageApiServiceImpl implements MessageApiService {
             List<StaffClerkRelationDTO> staffClerkRelationDTOS = staffClerkRelationApiService.listByStaffId(wxEnterpriseId, staffId);
             if (CollectionUtils.isNotEmpty(staffClerkRelationDTOS)) {
                 for (StaffClerkRelationDTO staffClerkRelationDTO : staffClerkRelationDTOS) {
-                    staffClerkRelationApiService.unbindByStaffAndClerkId(staffId, staffClerkRelationDTO.getClerkId());
+                    staffClerkRelationApiService.unbindByStaffAndClerkId(staffId, staffClerkRelationDTO.getClerkId(), ChannelCodeEnum.ADMIN_UNBIND.getCode());
                 }
             }
         }

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

@@ -209,12 +209,10 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 
 
     @Override
-    public void delByStoreIdAndCode(String storeId, String clerkCode) {
-        TabHaobanStaffClerkRelation staffClerkRelation = tabHaobanStaffClerkRelationMapper.getByCodeAndStoreId(clerkCode, storeId);
-        //删除绑定关系
-        tabHaobanStaffClerkRelationMapper.delByStoreIdAndCode(storeId, clerkCode);
-        //删除主门店
-        delSetMainStore(staffClerkRelation, ChannelCodeEnum.SELF_UNBIND.getCode());
+    public void delBindByStoreId(String wxEnterpriseId,String storeId, String staffId,int channelCode) {
+        Set<String> needUnBindStoreIds = new HashSet<>();
+        needUnBindStoreIds.add(storeId);
+        staffClerkRelationService.delBindByStoreIds(wxEnterpriseId, needUnBindStoreIds, staffId, ChannelCodeEnum.SELF_UNBIND.getCode());
     }
 
     @Override
@@ -236,8 +234,8 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
     }
 
     @Override
-    public boolean unbindByStaffAndClerkId(String staffId, String clerkId) {
-        return staffClerkRelationService.delBind(clerkId, staffId, ChannelCodeEnum.ADMIN_UNBIND.getCode());
+    public boolean unbindByStaffAndClerkId(String staffId, String clerkId,int channelCode) {
+        return staffClerkRelationService.delBind(clerkId, staffId, channelCode);
     }
 
     @Override
@@ -280,28 +278,6 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
     }
 
     @Override
-    public void delByClerkId(String clerkId) {
-        TabHaobanStaffClerkRelation staffClerkRelation = tabHaobanStaffClerkRelationMapper.getOneByClerkId(clerkId);
-        tabHaobanStaffClerkRelationMapper.delByClerkId(clerkId);
-        delSetMainStore(staffClerkRelation, ChannelCodeEnum.AUDIT_UNBIND.getCode());
-    }
-
-    private void delSetMainStore(TabHaobanStaffClerkRelation staffClerkRelation, Integer channelCode) {
-        if (staffClerkRelation == null) {
-            logger.info("staffClerkRelation为空");
-            return;
-        }
-        String staffId = staffClerkRelation.getStaffId();
-        String wxEnterpriseId = staffClerkRelation.getWxEnterpriseId();
-        String clerkId = staffClerkRelation.getClerkId();
-        externalClerkRelatedService.delByClerkIdAndStaffId(clerkId, staffId);
-        //删除主门店
-        clerkMainStoreRelatedService.delMainStore(staffId, staffClerkRelation.getStoreId(), wxEnterpriseId);
-        //废弃活码
-        hmClerkRelationApiService.delByClerkId(clerkId, staffClerkRelation.getEnterpriseId(), wxEnterpriseId, channelCode);
-    }
-
-    @Override
     public List<StaffClerkRelationDTO> listByEnterpriseIdAndStaffid(String enterpriseId, String staffid) {
         List<TabHaobanStaffClerkRelation> list = tabHaobanStaffClerkRelationMapper.listByEnterpriseIdAndStaffid(enterpriseId, staffid);
         return EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, list);

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

@@ -281,6 +281,9 @@
     <select id="pageStaff" resultMap="BaseResultMap">
         select
         a.*
+        <if test="departmentIds != null and departmentIds.size() > 0">
+	        , b.department_id departmentIds
+        </if>
         from tab_haoban_staff a
         <if test="departmentIds != null and departmentIds.size() > 0">
 	        left join tab_haoban_staff_department_related b on a.staff_id = b.staff_id  and b.status_flag = 1 

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

@@ -426,7 +426,6 @@
         <foreach collection="statusFlags" item="item" separator="," open="(" close=")">
             #{item}
         </foreach>
-        order by update_time desc
     </select>
 
     <update id="pushExternalByRelationKey">
@@ -653,6 +652,8 @@
         </if>
         order by create_time desc limit 1
     </select>
+
+
     <select id="countByMemberId" resultType="int">
         select count(*)
         from tab_haoban_external_clerk_related
@@ -667,4 +668,13 @@
         limit ${startItem},${pageSize} 
     </select>
 
+
+    <select id="getByStoreIdAndStaffId" resultType="java.lang.String">
+        select member_id
+        from tab_haoban_external_clerk_related
+        where store_id = #{storeId,jdbcType=VARCHAR}
+          and staff_id = #{staffId}
+          and status_flag in (1, 3, 4)
+    </select>
+
 </mapper>
\ No newline at end of file

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

@@ -24,7 +24,7 @@
         from tab_haoban_staff_clerk_relation
         where staff_clerk_relation_id = #{staffClerkRelationId,jdbcType=VARCHAR}
     </select>
-    
+
     <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation">
         insert into tab_haoban_staff_clerk_relation (staff_clerk_relation_id, staff_id, wx_enterprise_id,
                                                      enterprise_id, store_id,
@@ -194,9 +194,10 @@
         where clerk_id = #{clerkId,jdbcType=VARCHAR}
         and status_flag=1 order by create_time desc limit 1
     </select>
-    
-   
-    <select id="getByClerkIdForWxUserId"  resultType="com.gic.haoban.manage.api.dto.StaffClerkRelationDTO" parameterType="java.lang.String">
+
+
+    <select id="getByClerkIdForWxUserId" resultType="com.gic.haoban.manage.api.dto.StaffClerkRelationDTO"
+            parameterType="java.lang.String">
           select
         a.staff_clerk_relation_id staffClerkRelationId,
         a.staff_id staffId,
@@ -212,7 +213,7 @@
         left join tab_haoban_staff b on b.staff_id = a.staff_id
         where a.clerk_id = #{clerkId,jdbcType=VARCHAR} and a.status_flag=1
     </select>
-    
+
 
     <select id="getByClerkIdNoStatus" resultMap="BaseResultMap" parameterType="java.lang.String">
         select
@@ -262,8 +263,8 @@
         where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
         and status_flag =1
     </select>
-	
-	 <select id="lisByStaffId" resultMap="BaseResultMap">
+
+    <select id="lisByStaffId" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
         from tab_haoban_staff_clerk_relation
@@ -271,15 +272,15 @@
         wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
         and staff_id = #{staffId}
         and status_flag = 1
-         <if test="null != storeIdList">
-        	 and store_id in
-	        <foreach collection="storeIdList" item="item" separator="," open="(" close=")">
-	            #{item}
-	        </foreach>
+        <if test="null != storeIdList">
+            and store_id in
+            <foreach collection="storeIdList" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
         </if>
         order by create_time desc
     </select>
-	
+
     <select id="pageByWxEnterpriseId" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
@@ -287,7 +288,7 @@
         where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
         and status_flag =1
     </select>
-    
+
     <select id="listBindByStoreId" resultType="com.gic.haoban.manage.api.dto.StaffClerkRelationDTO">
         select
         a.staff_clerk_relation_id staffClerkRelationId,
@@ -369,31 +370,31 @@
     </select>
 
     <select id="listMemberStaffRelNew" resultType="com.gic.haoban.manage.service.entity.ext.MemberStaffRelExtDO">
-    	select * from (
-	        select ecr.member_id as memberId,
-	        ecr.external_user_id as memberExternalUserId,
-	        scr.staff_id as staffId,
-	        scr.clerk_id as staffClerkId
-	        from    tab_haoban_external_clerk_related as ecr 
-	         left join
-	        (select b.staff_id,
-	        a.clerk_id
-	        from tab_haoban_staff_clerk_relation a
-	        left join tab_haoban_staff b on a.staff_id = b.staff_id and b.status_flag = 1 
-	        where a.clerk_id in
-	        <foreach collection="clerkIdList" item="item" separator="," open="(" close=")">
-	            #{item}
-	        </foreach>
-	        and a.status_flag = 1 
-	        group by a.staff_id, a.clerk_id) as scr   on scr.staff_id = ecr.staff_id
-	        where ecr.status_flag = 1
-	        and ecr.enterprise_id = #{enterpriseId,jdbcType=VARCHAR}
-	        and ecr.wx_enterprise_id=#{wxEnterpriseId}
-	        and ecr.member_id in
-	        <foreach collection="memberIdList" item="item" separator="," open="(" close=")">
-	            #{item}
-	        </foreach>
-        ) t where t.staffId is not null 
+        select * from (
+        select ecr.member_id as memberId,
+        ecr.external_user_id as memberExternalUserId,
+        scr.staff_id as staffId,
+        scr.clerk_id as staffClerkId
+        from tab_haoban_external_clerk_related as ecr
+        left join
+        (select b.staff_id,
+        a.clerk_id
+        from tab_haoban_staff_clerk_relation a
+        left join tab_haoban_staff b on a.staff_id = b.staff_id and b.status_flag = 1
+        where a.clerk_id in
+        <foreach collection="clerkIdList" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        and a.status_flag = 1
+        group by a.staff_id, a.clerk_id) as scr on scr.staff_id = ecr.staff_id
+        where ecr.status_flag = 1
+        and ecr.enterprise_id = #{enterpriseId,jdbcType=VARCHAR}
+        and ecr.wx_enterprise_id=#{wxEnterpriseId}
+        and ecr.member_id in
+        <foreach collection="memberIdList" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        ) t where t.staffId is not null
     </select>
 
 
@@ -535,9 +536,9 @@
             #{id,jdbcType=VARCHAR}
         </foreach>
     </select>
-    
+
     <update id="deleteByEnterpriseId">
     	update tab_haoban_staff_clerk_relation set status_flag = 0 , update_time=now() where enterprise_id = #{enterpriseId}
     </update>
-    
+
 </mapper>
\ No newline at end of file

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

@@ -275,7 +275,7 @@ public class StaffController extends WebBaseController {
     @RequestMapping("del-clerk-relation")
     public HaobanResponse delStaffClerkList(String clerkId) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
-        boolean b = staffClerkRelationApiService.unbindByStaffAndClerkId(login.getClerkId(), clerkId);
+        boolean b = staffClerkRelationApiService.unbindByStaffAndClerkId(login.getClerkId(), clerkId,ChannelCodeEnum.ADMIN_UNBIND.getCode());
         return resultResponse(HaoBanErrCode.ERR_1, b);
     }
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java

@@ -110,7 +110,7 @@ public class ClerkController extends WebBaseController {
                 if (clerk != null) {
                     long memberCount = distributeApiService.getClerkMemberCount(staffClerkRelationDTO.getEnterpriseId(), clerk.getClerkId(), storeId);
                     logger.info("【获取会员数】enterpriseId={},clerkId={},storeId={},memberCount={}", staffClerkRelationDTO.getEnterpriseId(), clerk.getClerkId(), storeId, memberCount);
-                    staffDTO.setMemberCount(Convert.toInt(memberCount,0));
+                    staffDTO.setMemberCount(Convert.toInt(memberCount, 0));
                     staffDTO.setClerkId(clerk.getClerkId());
                     staffDTO.setClerkCode(clerk.getClerkCode());
                     resultList.add(EntityUtil.changeEntityNew(StaffVO.class, staffDTO));
@@ -281,9 +281,9 @@ public class ClerkController extends WebBaseController {
             return resultResponse(HaoBanErrCode.ERR_10012);
         }
         // 导购code校验-字母和数字
-        if (!clerkCode.matches("[a-zA-Z0-9]+")) {
-            return resultResponse(HaoBanErrCode.ERR_10023);
-        }
+        //if (!clerkCode.matches("[a-zA-Z0-9]+")) {
+        //    return resultResponse(HaoBanErrCode.ERR_10023);
+        //}
         if (version == null) {
             StaffDTO staff = staffApiService.selectByNationcodeAndPhoneNumber(wxEnterpriseId, nationcode, phoneNumber);
             if (staff != null) {
@@ -646,10 +646,10 @@ public class ClerkController extends WebBaseController {
             return !over;
         }).map(EnterpriseDetailDTO::getEnterpriseId).collect(Collectors.toList());
         List<String> storeIds = wxEnterpriseRelatedApiService.listStoreIdByWxEnterpriseId(wxEnterpriseId);
-        if(CollectionUtils.isEmpty(storeIds)) {
-            return resultResponse(HaoBanErrCode.ERR_1, new ArrayList<>()); 
+        if (CollectionUtils.isEmpty(storeIds)) {
+            return resultResponse(HaoBanErrCode.ERR_1, new ArrayList<>());
         }
-        logger.info("查询到企微门店数={},{}",storeIds.size(),storeIds);
+        logger.info("查询到企微门店数={},{}", storeIds.size(), storeIds);
         List<ClerkDTO> clerkList = clerkNewService.listClerkByEnterpriseIdAndSearchAndClerkType(enterpriseIdList, storeIds, keyword);
         List<ClerkStoreVO> clerkStoreList = buildClerkRelation(clerkList, enterpriseIdList);
         return resultResponse(HaoBanErrCode.ERR_1, clerkStoreList);
@@ -919,9 +919,7 @@ public class ClerkController extends WebBaseController {
             return resultResponse(HaoBanErrCode.ERR_111145);
         }
 
-        staffClerkRelationApiService.delByStoreIdAndCode(storeId, clerkCode);
-        //加入日志
-        staffClerkRelationApiService.pushToBindLog(staffClerkRelation.getStaffId(), clerkId, BindTypeEnum.UNBIND.getVal(), ChannelCodeEnum.SELF_UNBIND.getCode(), staffClerkRelation.getStaffClerkRelationId());
+        staffClerkRelationApiService.unbindByStaffAndClerkId(staffId, clerkId, ChannelCodeEnum.SELF_UNBIND.getCode());
         return resultResponse(HaoBanErrCode.ERR_1);
     }
 
@@ -1014,7 +1012,7 @@ public class ClerkController extends WebBaseController {
         if (staffRelation == null) {
             return resultResponse(HaoBanErrCode.ERR_10006);
         }
-       // staffApiService.wxGetAdd(staffRelation.getWxUserId(), wxEnterpriseId);
+        // staffApiService.wxGetAdd(staffRelation.getWxUserId(), wxEnterpriseId);
         String staffId = staffRelation.getStaffId();
         StaffDTO staff = staffApiService.selectById(staffId);
         if (staff == null) {
@@ -1217,14 +1215,14 @@ public class ClerkController extends WebBaseController {
         if (StringUtils.isNotBlank(wxOpenId)) {
             return RestResponse.successResult(wxOpenId);
         }
-        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseApiService.getQwInfo(wxEnterpriseId) ;
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseApiService.getQwInfo(wxEnterpriseId);
         if (qwDTO == null) {
             int code = HaoBanErrCode.ERR_400002.getCode();
             return RestResponse.failure(String.valueOf(code), HaoBanErrCode.ERR_400002.getMsg());
         }
         String wxUserId = staffDTO.getWxUserId();
-        if(qwDTO.needOpenUserId3th()) {
-            wxUserId = staffDTO.getWxOpenUseId() ;
+        if (qwDTO.needOpenUserId3th()) {
+            wxUserId = staffDTO.getWxOpenUseId();
         }
         String openid = qywxUserApiService.getSelfOpenIdByUserId(qwDTO.getThirdCorpid(), config.getWxSuiteid(), wxUserId);
         if (StringUtils.isBlank(openid)) {