导购关联表关联成员状态

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

@@ -82,8 +82,6 @@ public interface StaffClerkRelationApiService {
      */
     List<StaffClerkRelationDTO> listByStoreId(String storeId);
 
-    List<StaffClerkRelationDTO> listByStoreIds(List<String> storeIds);
-
     /**
      * 查询导购信息
      * @param storeId

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

@@ -72,17 +72,17 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
 
     @Override
     public List<StaffClerkRelationDTO> listBindCode(String wxEnterpriseId, String enterpriseId, Set<String> clerkCodeList) {
-        return EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, mapper.listBindCode(wxEnterpriseId, enterpriseId, clerkCodeList));
+        return mapper.listBindCode(wxEnterpriseId, enterpriseId, clerkCodeList);
     }
 
     @Override
     public List<StaffClerkRelationDTO> listBindCodeByStaffId(List<String> enterpriseIdList, String staffId) {
-        return EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, mapper.listBindCodeByStaffId(enterpriseIdList, staffId));
+        return  mapper.listBindCodeByStaffId(enterpriseIdList, staffId);
     }
 
     @Override
     public boolean delBind(String oldClerkId, String optStaffId, int channelCode, String newClerkId) {
-        TabHaobanStaffClerkRelation clerkRelation = mapper.getByClerkId(oldClerkId, null);
+        StaffClerkRelationDTO clerkRelation = mapper.getOneByClerkId(oldClerkId, null);
         if (null == clerkRelation) {
             logger.info("老的绑定关联不存在,clerkId={}", oldClerkId);
             return true;
@@ -126,13 +126,15 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
             logger.info("没有传门店列表：{}", wxEnterpriseId);
             return true;
         }
-        List<TabHaobanStaffClerkRelation> needUnbind = mapper.listBindByStoreIds(wxEnterpriseId, storeIds);
+        List<String> storeIdList = new ArrayList<>();
+        storeIdList.addAll(storeIds) ;
+        List<StaffClerkRelationDTO> needUnbind = mapper.listByStoreIds(wxEnterpriseId, storeIdList);
         if (CollectionUtils.isEmpty(needUnbind)) {
             logger.info("没有门店绑定了需要解绑的：{}", wxEnterpriseId);
             return true;
         }
 
-        for (TabHaobanStaffClerkRelation staffClerkRelation : needUnbind) {
+        for (StaffClerkRelationDTO staffClerkRelation : needUnbind) {
             String enterpriseId = staffClerkRelation.getEnterpriseId();
             //删除好友通知会员
             List<String> memberIds = externalClerkRelatedService.getByStoreIdAndStaffId(staffClerkRelation.getStoreId(), staffClerkRelation.getStaffId());
@@ -146,7 +148,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
         clerkMainStoreRelatedService.delMainStoreByStoreIds(storeIds);
         //放入队列
         staffClerkBindLogService.pushToMqBatch(optStaffId, BindTypeEnum.UNBIND.getVal(), channelCode, need);
-        for (TabHaobanStaffClerkRelation clerkRelation : needUnbind) {
+        for (StaffClerkRelationDTO clerkRelation : needUnbind) {
             //废弃活码
             String enterpriseId = clerkRelation.getEnterpriseId();
             hmClerkRelationApiService.delByClerkId(clerkRelation.getClerkId(), enterpriseId, wxEnterpriseId, channelCode);
@@ -212,13 +214,12 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
 
     @Override
     public StaffClerkRelationDTO getBindByClerkId(String clerkId, String wxEnterpriseId) {
-        TabHaobanStaffClerkRelation relation = mapper.getBindByClerkId(clerkId, wxEnterpriseId);
-        return EntityUtil.changeEntityByJSON(StaffClerkRelationDTO.class, relation);
+        return mapper.getOneByClerkId(clerkId, wxEnterpriseId);
     }
 
     @Override
     public StaffClerkRelationDTO getByCodeAndEnterpriseId(String clerkCode, String enterpriseId) {
-        return EntityUtil.changeEntityByJSON(StaffClerkRelationDTO.class, mapper.getByCodeAndEnterpriseId(clerkCode, enterpriseId));
+        return mapper.getByCodeAndEnterpriseId(clerkCode, enterpriseId);
     }
 
 
@@ -254,17 +255,17 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
 
     @Override
     public StaffClerkRelationDTO getOneBindByStoreId(String staffId, String storeId) {
-        return EntityUtil.changeEntityByJSON(StaffClerkRelationDTO.class, mapper.getOneBindStoreId(staffId, storeId));
+        return mapper.getOneByStoreIdAndStaffId(storeId,staffId);
     }
 
     @Override
     public StaffClerkRelationDTO getByClerkId(String clerkId) {
-        return EntityUtil.changeEntityByJSON(StaffClerkRelationDTO.class, mapper.getByClerkId(clerkId, null));
+        return mapper.getOneByClerkId(clerkId, null);
     }
 
     @Override
     public StaffClerkRelationDTO getByClerkId(String clerkId, String wxEnterpriseId) {
-        TabHaobanStaffClerkRelation staffClerkRelation = mapper.getByClerkId(clerkId, wxEnterpriseId);
+        StaffClerkRelationDTO staffClerkRelation = mapper.getOneByClerkId(clerkId, wxEnterpriseId);
         return EntityUtil.changeEntityNew(StaffClerkRelationDTO.class, staffClerkRelation);
     }
 
@@ -308,19 +309,19 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
     @Override
     public Page<StaffClerkRelationDTO> pageByWxEnterpriseId(String wxEnterpriseId, BasePageInfo pageInfo) {
         PageHelper.startPage(pageInfo);
-        List<TabHaobanStaffClerkRelation> clerkBindList = mapper.pageByWxEnterpriseId(wxEnterpriseId);
+        List<StaffClerkRelationDTO> clerkBindList = mapper.pageByWxEnterpriseId(wxEnterpriseId);
         Page<StaffClerkRelationDTO> retPage = PageUtil.changePageHelperToCurrentPage(new PageInfo<>(clerkBindList), StaffClerkRelationDTO.class);
         return retPage;
     }
 
     @Override
     public List<StaffClerkRelationDTO> listBindByStoreId(String wxEnterpriseId, String storeId) {
-        return mapper.listBindByStoreId(wxEnterpriseId, storeId);
+        return mapper.listByStoreIds(wxEnterpriseId, Arrays.asList(storeId));
     }
 
     @Override
     public List<StaffClerkRelationDTO> listBindStoreIdByEnterpriseId(String enterpriseId) {
-        List<TabHaobanStaffClerkRelation> clerkRelations = mapper.listBindStoreIdByEnterpriseId(enterpriseId);
+        List<StaffClerkRelationDTO> clerkRelations = mapper.listBindStoreIdByEnterpriseId(enterpriseId);
         if (CollectionUtils.isEmpty(clerkRelations)) {
             return new ArrayList<>();
         }
@@ -339,9 +340,9 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
         }
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
         if (qwDTO.needOpenUserId3th()) {
-            return mapper.listWxOpenUserIdByClerkIds(clerkList, wxEnterpriseId);
+            return mapper.listWxUserIdByClerkIds(clerkList, wxEnterpriseId,2);
         }
-        return mapper.listWxUserIdByClerkIds(clerkList, wxEnterpriseId);
+        return mapper.listWxUserIdByClerkIds(clerkList, wxEnterpriseId,1);
     }
 
     @Override
@@ -351,9 +352,9 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
         }
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
         if (qwDTO.needOpenUserId3th()) {
-            return mapper.listIdsByWxOpenUserIds(wxUserIds, wxEnterpriseId, enterpriseId);
+            return mapper.listIdsByWxUserIds(wxUserIds, wxEnterpriseId, enterpriseId,2);
         }
-        return mapper.listIdsByWxUserIds(wxUserIds, wxEnterpriseId, enterpriseId);
+        return mapper.listIdsByWxUserIds(wxUserIds, wxEnterpriseId, enterpriseId,1);
     }
 
     @Override
@@ -385,6 +386,6 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
 
     @Override
     public List<StaffClerkRelationDTO> listManageBindByStaffId(String staffId) {
-        return EntityUtil.changeEntityListNew(StaffClerkRelationDTO.class, mapper.listManageBindByStaffId(staffId));
+        return mapper.listManageBindByStaffId(staffId);
     }
 }

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

@@ -439,7 +439,7 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
 
     @Override
     public boolean isFriends(String memberId, String clerkId, String enterpriseId) {
-        TabHaobanStaffClerkRelation staffClerkRelation = staffClerkRelationMapper.getByClerkId(clerkId,null);
+        StaffClerkRelationDTO staffClerkRelation = staffClerkRelationMapper.getOneByClerkId(clerkId,null);
         if (staffClerkRelation == null) {
             return false;
         }

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

@@ -246,18 +246,7 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 
     @Override
     public List<StaffClerkRelationDTO> listByStoreId(String storeId) {
-        List<TabHaobanStaffClerkRelation> list = tabHaobanStaffClerkRelationMapper.listByStoreId(storeId);
-        if (CollectionUtil.isEmpty(list)) {
-            return new ArrayList<>();
-        }
-        List<StaffClerkRelationDTO> result = EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, list);
-        return result;
-    }
-
-    @Override
-    public List<StaffClerkRelationDTO> listByStoreIds(List<String> storeIds) {
-        List<TabHaobanStaffClerkRelation> list = tabHaobanStaffClerkRelationMapper.listByStoreIds(storeIds);
-        return EntityUtil.changeEntityListNew(StaffClerkRelationDTO.class, list);
+        return tabHaobanStaffClerkRelationMapper.listByStoreIds(null,Arrays.asList(storeId));
     }
 
     @Override
@@ -267,9 +256,7 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 
     @Override
     public StaffClerkRelationDTO getOneByClerkId(String clerkId) {
-        TabHaobanStaffClerkRelation tab = tabHaobanStaffClerkRelationMapper.getOneByClerkId(clerkId);
-        StaffClerkRelationDTO result = EntityUtil.changeEntityByJSON(StaffClerkRelationDTO.class, tab);
-        return result;
+        return tabHaobanStaffClerkRelationMapper.getOneByClerkId(clerkId,null);
     }
 
     @Override
@@ -284,13 +271,12 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
     }
 
     @Override
-    public StaffClerkRelationDTO getOneByStoreIdAndStaffId(String storeId,
-                                                           String staffId) {
-        TabHaobanStaffClerkRelation tab = tabHaobanStaffClerkRelationMapper.getOneByStoreIdAndStaffId(storeId, staffId);
+    public StaffClerkRelationDTO getOneByStoreIdAndStaffId(String storeId,String staffId) {
+        StaffClerkRelationDTO tab = tabHaobanStaffClerkRelationMapper.getOneByStoreIdAndStaffId(storeId, staffId);
         if (tab == null) {
             return null;
         }
-        return EntityUtil.changeEntity(StaffClerkRelationDTO.class, tab);
+        return tab;
     }
 
     @Override
@@ -338,8 +324,7 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 
     @Override
     public List<StaffClerkRelationDTO> listByEnterpriseIdAndStaffid(String enterpriseId, String staffid) {
-        List<TabHaobanStaffClerkRelation> list = tabHaobanStaffClerkRelationMapper.listByEnterpriseIdAndStaffid(enterpriseId, staffid);
-        return EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, list);
+        return tabHaobanStaffClerkRelationMapper.listByEnterpriseIdAndStaffid(enterpriseId, staffid);
     }
 
     @Override

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

 package com.gic.haoban.manage.service.service.out.impl;
 
-import cn.hutool.core.collection.CollectionUtil;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
 import com.alibaba.fastjson.JSONObject;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.EntityUtil;
+import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
@@ -16,24 +33,14 @@ import com.gic.haoban.manage.api.util.notify.NoticeMessageUtil;
 import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.StaffDepartmentRelatedMapper;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
-import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
 import com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated;
 import com.gic.haoban.manage.service.service.StaffDepartmentRelatedService;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.gic.wechat.api.dto.qywx.ItemDTO;
 import com.gic.wechat.api.dto.qywx.QywxXcxSendMessageDTO;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
+import cn.hutool.core.collection.CollectionUtil;
 
 @Service
 public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRelatedApiService {
@@ -135,7 +142,7 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
     public Map<String, String> getWxUserIdByClerkId(String clerkId) {
         Map<String, String> map = new HashMap<>();
 
-        TabHaobanStaffClerkRelation relation = tabHaobanStaffClerkRelationMapper.getOneByClerkId(clerkId);
+        StaffClerkRelationDTO relation = tabHaobanStaffClerkRelationMapper.getOneByClerkId(clerkId,null);
         if (relation == null) {
             return map;
         }
@@ -267,7 +274,7 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
             logger.info("店长不存在，发送消息失败{}", storeId);
             return;
         }
-        TabHaobanStaffClerkRelation tab = tabHaobanStaffClerkRelationMapper.getOneByClerkId(gicClerk.getClerkId());
+        StaffClerkRelationDTO tab = tabHaobanStaffClerkRelationMapper.getOneByClerkId(gicClerk.getClerkId(),null);
         if (tab == null) {
             logger.info("店长未绑定clerkId={}", gicClerk.getClerkId());
             return;
@@ -298,7 +305,7 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
             logger.info("店长不存在，发送消息失败{}", storeId);
             return;
         }
-        TabHaobanStaffClerkRelation tab = tabHaobanStaffClerkRelationMapper.getOneByClerkId(gicClerk.getClerkId());
+        StaffClerkRelationDTO tab = tabHaobanStaffClerkRelationMapper.getOneByClerkId(gicClerk.getClerkId(),null);
         if (tab == null) {
             logger.info("店长未绑定clerkId={}", gicClerk.getClerkId());
             return;