fix:解绑入口统一，并将好友关系解除通知会员

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
@@ -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);
 
 
     /**
@@ -196,16 +191,15 @@ public interface StaffClerkRelationApiService {
     void clerkStoreMoveDel(String param);
 
     /**
-     * 
-    * @Title: getCanAddHmCount
-    * @Description: 获取能创建活码的导购数量
-    * @author xugh
      * @param enterpriseId
      * @param wxEnterpriseId
      * @return
      * @throws
+     * @Title: getCanAddHmCount
+     * @Description: 获取能创建活码的导购数量
+     * @author xugh
      */
-    int getCanAddHmCount(String enterpriseId , String wxEnterpriseId , String clerkId) ;
+    int getCanAddHmCount(String enterpriseId, String wxEnterpriseId, String clerkId);
 
     List<String> listStaffIdByWxEnterpriseId(String wxEnterpriseId);
 

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);

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/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

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

@@ -86,9 +86,9 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
         if (b) {
             //推入日志
             staffClerkBindLogService.pushToMq(clerkRelation.getStaffId(), optStaffId, BindTypeEnum.UNBIND.getVal(), channelCode, clerkRelation.getStaffClerkRelationId());
-
             //废弃活码
             hmClerkRelationApiService.delByClerkId(clerkId, clerkRelation.getEnterpriseId(), clerkRelation.getWxEnterpriseId(), channelCode);
+            // TODO: 2022/9/15 解绑通知会员 
         }
         return b;
     }

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,12 +202,7 @@ 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()) {
             //解绑申请，无需审核，直接通过

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;
@@ -316,7 +313,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-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));
@@ -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)) {
+        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);
     }
 
@@ -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)) {