feat:新增查询所有与好办相关导购

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffClerkInfoDTO.java

@@ -3,8 +3,9 @@ package com.gic.haoban.manage.api.dto;
 import java.io.Serializable;
 import java.util.Date;
 
-public class StaffClerkInfoDTO implements Serializable{
+public class StaffClerkInfoDTO implements Serializable {
 
+    private static final long serialVersionUID = 1L;
 
     private String staffClerkRelationId;
 
@@ -48,8 +49,6 @@ public class StaffClerkInfoDTO implements Serializable{
         this.mainStoreFlag = mainStoreFlag;
     }
 
-    private static final long serialVersionUID = 1L;
-
     public String getEnterpriseName() {
         return enterpriseName;
     }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffClerkRelationDTO.java

@@ -3,8 +3,9 @@ package com.gic.haoban.manage.api.dto;
 import java.io.Serializable;
 import java.util.Date;
 
-public class StaffClerkRelationDTO implements Serializable{
+public class StaffClerkRelationDTO implements Serializable {
 
+    private static final long serialVersionUID = 1L;
 
     private String staffClerkRelationId;
 
@@ -28,7 +29,8 @@ public class StaffClerkRelationDTO implements Serializable{
 
     private Date updateTime;
 
-    private static final long serialVersionUID = 1L;
+    private String storeName;
+    private String staffName;
 
     public String getStaffClerkRelationId() {
         return staffClerkRelationId;
@@ -118,4 +120,19 @@ public class StaffClerkRelationDTO implements Serializable{
         this.updateTime = updateTime;
     }
 
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
 }

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

 package com.gic.haoban.manage.api.service;
 
-import java.util.List;
-import java.util.Set;
-
 import com.gic.api.base.commons.Page;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.ServiceResponse;
@@ -10,12 +7,16 @@ import com.gic.haoban.manage.api.dto.StaffClerkBindLogDetailDTO;
 import com.gic.haoban.manage.api.dto.StaffClerkInfoDTO;
 import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
 
+import java.util.List;
+import java.util.Set;
+
 public interface StaffClerkRelationApiService {
 	/**
 	 * 绑定日志
+	 *
 	 * @param params
 	 */
-	public void  bindLogMq(String params);
+	void bindLogMq(String params);
 
 	List<StaffClerkRelationDTO> listBindCode(String enterpriseId, Set<String> clerkCodeList);
 
@@ -30,9 +31,10 @@ public interface StaffClerkRelationApiService {
 
 	/**
 	 * 绑定
+	 *
 	 * @return
 	 */
-	public ServiceResponse bindStaffClerk(StaffClerkRelationDTO staffClerkRelationDTO,String optStaffId,int chanelCode);
+	ServiceResponse bindStaffClerk(StaffClerkRelationDTO staffClerkRelationDTO, String optStaffId, int chanelCode);
 	
 	StaffClerkRelationDTO getByCodeAndEnterpriseId(String clerkCode, String enterpriseId);
 
@@ -96,40 +98,49 @@ public interface StaffClerkRelationApiService {
 
 	/**
 	 * 搜索查询列表
+	 *
 	 * @param wxEnterpriseId
 	 * @param search
 	 * @param enterpriseId
 	 * @param optType
 	 * @return
 	 */
-	public Page<StaffClerkBindLogDetailDTO> pageStaffClerkBindLog(String wxEnterpriseId, String search, String enterpriseId, int optType, BasePageInfo pageInfo);
+	Page<StaffClerkBindLogDetailDTO> pageStaffClerkBindLog(String wxEnterpriseId, String search, String enterpriseId, int optType, BasePageInfo pageInfo);
 
 	/**
 	 * 追加到绑定日志
+	 *
 	 * @param staffId
 	 * @param optStaffId
 	 * @param optType
 	 * @param channelCode
 	 * @param relationId
 	 */
-	public void pushToBindLog(String staffId,String optStaffId,int optType,int channelCode,String relationId);
+	void pushToBindLog(String staffId, String optStaffId, int optType, int channelCode, String relationId);
 
 
 	/**
 	 * 获取config
+	 *
 	 * @param clerkId
 	 * @param memberId
 	 * @return
 	 */
 	ServiceResponse<String> getClerkMemberChatConfig(String clerkId);
+
 	/**
-	 *
-     * @Description 方法描述:
 	 * @return 返回值类型: <pre>
 	 * @author 作者: WQ <pre>
 	 * @date 时间: 2020年12月24日 上午11:21:38 <pre>
 	 * @param wxEnterpriseId: <pre>
 	 * @param pageInfo: <pre>
+	 * @Description 方法描述:
+	 */
+	Page<StaffClerkRelationDTO> pageByWxEnterpriseId(String wxEnterpriseId, BasePageInfo pageInfo);
+
+	/**
+	 * 查询状态正常导购
+	 * @return
 	 */
-	public Page<StaffClerkRelationDTO> pageByWxEnterpriseId(String wxEnterpriseId, BasePageInfo pageInfo);
+	List<StaffClerkRelationDTO> listAll();
 }

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

 package com.gic.haoban.manage.service.dao.mapper;
 
-import java.util.List;
-import java.util.Set;
-
-import org.apache.ibatis.annotations.Param;
-
 import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
 import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Set;
 
 public interface TabHaobanStaffClerkRelationMapper {
     int deleteByPrimaryKey(String staffClerkRelationId);
@@ -25,14 +24,16 @@ public interface TabHaobanStaffClerkRelationMapper {
 
 	List<TabHaobanStaffClerkRelation> listBindCodeByStaffId(@Param("enterpriseIdList")List<String> enterpriseIdList, @Param("staffId")String staffId);
 
-	TabHaobanStaffClerkRelation getOneByClerkId(@Param("clerkId")String clerkId);
+    TabHaobanStaffClerkRelation getOneByClerkId(@Param("clerkId") String clerkId);
+
     /**
      * 改变状态 格局clerkId
+     *
      * @param clerkId
      * @param status
      * @return
      */
-	public int changeStatusByClerkId(@Param("clerkId") String clerkId,@Param("status") Integer status);
+    int changeStatusByClerkId(@Param("clerkId") String clerkId, @Param("status") Integer status);
 
     /**
      * 更新信息
@@ -117,7 +118,18 @@ public interface TabHaobanStaffClerkRelationMapper {
 
     /**
      * 已使用的门店id列表
+     *
      * @param enterpriseId
      */
     List<TabHaobanStaffClerkRelation> listBindStoreIdByEnterpriseId(String enterpriseId);
+
+
+    /**
+     * 列出所有
+     *
+     * @return {@link List<TabHaobanStaffClerkRelation> }
+     * @author xuwenqian
+     * @date 2021-07-15 16:24:27
+     */
+    List<StaffClerkRelationDTO> listAll();
 }
\ No newline at end of file

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

 package com.gic.haoban.manage.service.service;
 
-import java.util.List;
-import java.util.Set;
-
 import com.gic.api.base.commons.Page;
 import com.gic.haoban.base.api.common.BasePageInfo;
-import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
 import com.gic.haoban.manage.service.entity.MemberClerkChatConfig;
 import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
 
-import org.apache.ibatis.annotations.Param;
+import java.util.List;
+import java.util.Set;
 
 public interface StaffClerkRelationService {
 
@@ -20,10 +17,11 @@ public interface StaffClerkRelationService {
 
 	/**
 	 * 删除绑定
+	 *
 	 * @param clerkId
 	 * @return
 	 */
-	public boolean delBind(String clerkId,String optStaffId,int chanelCode);
+	boolean delBind(String clerkId, String optStaffId, int chanelCode);
 
 	/**
 	 * 删除绑定
@@ -32,7 +30,7 @@ public interface StaffClerkRelationService {
 	 * @param storeIds
 	 * @return
 	 */
-	public boolean delBindByStoreIds(String wxEnterpriseId, Set<String> storeIds, String optStaffId, int chanelCode);
+	boolean delBindByStoreIds(String wxEnterpriseId, Set<String> storeIds, String optStaffId, int chanelCode);
 
 	/**
 	 * 删除绑定
@@ -42,35 +40,37 @@ public interface StaffClerkRelationService {
 	 * @param storeIds       解除除了这些门店之外的绑定的门店
 	 * @return
 	 */
-	public boolean delBindNotInStoreIds(String wxEnterpriseId, String enterpriseId, Set<String> storeIds, String optStaffId, int chanelCode);
+	boolean delBindNotInStoreIds(String wxEnterpriseId, String enterpriseId, Set<String> storeIds, String optStaffId, int chanelCode);
 
 	/**
 	 * 绑定
+	 *
 	 * @param dto
 	 * @return
 	 */
-	public String bind(StaffClerkRelationDTO dto,String optStaffId,int chanelCode);
+	String bind(StaffClerkRelationDTO dto, String optStaffId, int chanelCode);
 
 	/**
 	 * 根据clerkId 更新数据
 	 * @param dto
 	 * @return
 	 */
-	public boolean updateByClerkId(StaffClerkRelationDTO dto);
+	boolean updateByClerkId(StaffClerkRelationDTO dto);
 
 	/**
 	 * 查询绑定根据clerkId
+	 *
 	 * @param clerkId
 	 * @param wxEnterpriseId
 	 * @return
 	 */
-	public StaffClerkRelationDTO getBindByClerkId(String clerkId,String wxEnterpriseId);
+	StaffClerkRelationDTO getBindByClerkId(String clerkId, String wxEnterpriseId);
 
 	StaffClerkRelationDTO getByCodeAndEnterpriseId(String clerkCode, String enterpriseId);
 
 	String insert(StaffClerkRelationDTO staffClerkRelation);
 
-	public int cleanStaffClerk( String wxEnterpriseId, List<String> staffIds);
+	int cleanStaffClerk(String wxEnterpriseId, List<String> staffIds);
 
 	StaffClerkRelationDTO getOneBindCodeNoStatus(String enterpriseId, String clerkCode);
 
@@ -86,15 +86,15 @@ public interface StaffClerkRelationService {
 	 * 保存
 	 * @param memberClerkChatConfig
 	 */
-	public void saveChatConfig(MemberClerkChatConfig memberClerkChatConfig);
+	void saveChatConfig(MemberClerkChatConfig memberClerkChatConfig);
 
 	/**
-	 *
 	 * @param staffId
 	 * @param memberId
 	 * @return
 	 */
-	public MemberClerkChatConfig getChatConfig(String staffId,String memberId);
+	MemberClerkChatConfig getChatConfig(String staffId, String memberId);
+
 	/**
 	 * 根据企业查询
 	 * @param wxEnterpriseId
@@ -121,5 +121,14 @@ public interface StaffClerkRelationService {
 	 */
 	List<StaffClerkRelationDTO> listBindStoreIdByEnterpriseId(String enterpriseId);
 
+	/**
+	 * 查询所有正常导购
+	 *
+	 * @return {@link List<StaffClerkRelationDTO> }
+	 * @author xuwenqian
+	 * @date 2021-07-15 16:26:17
+	 */
+	List<StaffClerkRelationDTO> listAll();
+
 
 }

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

 package com.gic.haoban.manage.service.service.impl;
 
-import java.util.*;
-import java.util.stream.Collectors;
-
 import com.alibaba.fastjson.JSONObject;
+import com.gic.api.base.commons.Page;
+import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.ToolUtil;
 import com.gic.haoban.base.api.common.BasePageInfo;
-import com.gic.haoban.base.api.common.ServiceResponse;
+import com.gic.haoban.common.utils.PageUtil;
+import com.gic.haoban.common.utils.StringUtil;
+import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
 import com.gic.haoban.manage.api.enums.BindTypeEnum;
 import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanMemberClerkChatConfigMapper;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
 import com.gic.haoban.manage.service.entity.MemberClerkChatConfig;
-import com.gic.haoban.manage.service.entity.TabHaobanClerkMainStoreRelated;
-import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkBindLog;
 import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
-import com.gic.haoban.manage.service.service.ClerkMainStoreRelatedService;
-import com.gic.haoban.manage.service.service.ExternalClerkRelatedService;
-import com.gic.haoban.manage.service.service.StaffClerkBindLogService;
-import com.gic.haoban.manage.service.service.StaffService;
-import com.gic.wechat.api.dto.qywx.QywxExternalcontactDTO;
+import com.gic.haoban.manage.service.service.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-
-import javafx.scene.control.Tab;
-
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -31,14 +24,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.gic.api.base.commons.Page;
-import com.gic.commons.util.EntityUtil;
-import com.gic.haoban.common.utils.PageUtil;
-import com.gic.haoban.common.utils.StringUtil;
-import com.gic.haoban.manage.api.dto.StaffClerkBindLogDetailDTO;
-import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
-import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
-import com.gic.haoban.manage.service.service.StaffClerkRelationService;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class StaffClerkRelationServiceImpl implements StaffClerkRelationService {
@@ -293,4 +280,9 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
         }
         return EntityUtil.changeEntityListNew(StaffClerkRelationDTO.class, clerkRelations);
     }
+
+    @Override
+    public List<StaffClerkRelationDTO> listAll() {
+        return mapper.listAll();
+    }
 }

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

@@ -233,12 +233,11 @@
 
  <update id="delByStoreIdAndCode" >
    update tab_haoban_staff_clerk_relation
-    set
-    status_flag = 0,
+   set status_flag = 0,
        update_time = now()
    where clerk_code = #{clerkCode,jdbcType=VARCHAR}
      and store_id = #{storeId,jdbcType=VARCHAR}
-    		and status_flag =1
+     and status_flag = 1
  </update>
 
     <select id="listByClerkIds" resultMap="BaseResultMap" parameterType="java.lang.String" >
@@ -426,13 +425,24 @@
   </update>
 
   <select id="listBindStoreIdByEnterpriseId" resultMap="BaseResultMap">
-    select
-     store_id,
+    select store_id,
            wx_enterprise_id
     from tab_haoban_staff_clerk_relation
-    where
-      enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
-    and status_flag =1
+    where enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
+      and status_flag = 1
     group by store_id
   </select>
+
+  <select id="listAll" resultType="com.gic.haoban.manage.api.dto.StaffClerkRelationDTO">
+    SELECT a.store_id,
+           a.staff_id,
+           a.clerk_id,
+           b.staff_name,
+           c.store_name
+    FROM tab_haoban_staff_clerk_relation a
+           LEFT JOIN tab_haoban_staff b ON b.staff_id = a.staff_id
+           LEFT JOIN tab_gic_clerk c ON c.clerk_id = a.clerk_id
+    WHERE a.status_flag = 1
+    GROUP BY a.staff_id
+  </select>
 </mapper>
\ No newline at end of file

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

@@ -303,20 +303,23 @@ public class StoreController extends WebBaseController{
 	//获取门店详情
 	public boolean isEnterpriseOver(String storeId) {
 		StoreDTO store = storeService.getStore(storeId);
-		if(store == null){
+		if (store == null) {
 			return true;
 		}
-		EnterpriseDTO enterprise = enterpriseService.getEnterpriseByEid(store.getEnterpriseId());
+		EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(store.getEnterpriseId());
 		if (enterprise == null || enterprise.getStatus() != 1) {
 			return true;
 		}
 		if (enterprise.getExpireTime() == null) {
 			if (enterprise.getEnabledState() == null) {
 				return false;
-			} else return enterprise.getEnabledState() != 1;
-		} else
+			} else {
+				return enterprise.getEnabledState() != 1;
+			}
+		} else {
 			return enterprise.getExpireTime().getTime() <= System.currentTimeMillis() || enterprise.getEnabledState() != 1;
 		}
+	}
 	
 	
 }