111

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

@@ -41,5 +41,11 @@ public interface StaffClerkRelationApiService {
 	
 	List<StaffClerkRelationDTO> listByClerkIds(List<String> clerkIds);
 
+	/**
+	 * 导购列表
+	 * @param storeId
+	 * @return
+	 */
+	List<StaffClerkRelationDTO>listByStoreId(String storeId);
 
 }

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

@@ -57,4 +57,6 @@ public interface TabHaobanStaffClerkRelationMapper {
     
     
     List<TabHaobanStaffClerkRelation> listByClerkIds(@Param("clerkIds") List<String> clerkIds);
+    
+    List<TabHaobanStaffClerkRelation> listByStoreId(@Param("storeId")String storeId);
 }
\ No newline at end of file

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

@@ -136,4 +136,13 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 		List<StaffClerkRelationDTO> result = EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, list);
 		return result;
 	}
+	@Override
+	public List<StaffClerkRelationDTO> listByStoreId(String storeId) {
+		List<TabHaobanStaffClerkRelation> list = tabHaobanStaffClerkRelationMapper.listByStoreId(storeId);
+		if(CollectionUtil.isEmpty(list)){
+			return new ArrayList<StaffClerkRelationDTO>();
+		}
+		List<StaffClerkRelationDTO> result = EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, list);
+		return result;	
+	}
 }

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

@@ -252,4 +252,14 @@
 	    </foreach>
   </select>
   
+      <select id="listByStoreId" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from tab_haoban_staff_clerk_relation
+    where status_flag=1
+    	  and store_id = #{storeId,jdbcType=VARCHAR} 
+  </select>
+  
+  
+  
 </mapper>
\ No newline at end of file

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

@@ -171,71 +171,34 @@ public class ClerkController extends WebBaseController{
 	}
 	//选择成员列表
 	@RequestMapping("/staff-list")
-	public HaobanResponse staffList(String departmentId) {
-		if(StringUtils.isAnyBlank(departmentId)){
+	public HaobanResponse staffList(String storeId) {
+		if(StringUtils.isAnyBlank(storeId)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
-		List<StaffDepartmentRelatedDTO> list = staffDepartmentRelatedApiService.listByDepartmentId(departmentId);
-		Map<String,StaffDepartmentRelatedDTO> relatedMap = com.gic.commons.util.CollectionUtil.toMap(list, "staffId");
+		List<StaffClerkRelationDTO> list = staffClerkRelationApiService.listByStoreId(storeId);
 		List<String> staffIds = list.stream().map(s->s.getStaffId()).collect(Collectors.toList());
 		List<StaffDTO>  resultlist= staffApiService.listByIds(staffIds);
-		DepartmentDTO departmentDTO = departmentApiService.selectById(departmentId);
-		String storeId = departmentDTO.getRelatedId();
+		Map<String,StaffClerkRelationDTO> map = com.gic.commons.util.CollectionUtil.toMap(list, "staffId");
 		int size = 0;
 		if(resultlist != null){
 			size = resultlist.size();
 		}
 		for(StaffDTO dto :resultlist){
-			StaffDepartmentRelatedDTO related = relatedMap.get(dto.getStaffId());
-			if(related != null){
-				dto.setStaffDepartmentRelatedId(related.getStaffDepartmentRelatedId());
-				if(org.apache.commons.lang.StringUtils.isNotBlank(related.getClerkCode())){
-					dto.setBindFlag(1);
-					dto.setClerkCode(related.getClerkCode());
-					
+			StaffClerkRelationDTO staffClerkRelationDTO = map.get(dto.getStaffId());
+			dto.setClerkCode(staffClerkRelationDTO.getClerkCode());
 			if(size < 20){
-						ClerkDTO clerk = clerkService.getClerkByClerkCode(departmentDTO.getEnterpriseId(), related.getClerkCode());
+				ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), staffClerkRelationDTO.getClerkCode());
 				if(clerk != null){
-							long memberCount = distributeApiService.getClerkMemberCount(departmentDTO.getEnterpriseId(), clerk.getClerkId(), storeId);
-							logger.info("【获取会员数】enterpriseId={},clerkId={},storeId={},count={}",departmentDTO.getEnterpriseId(),clerk.getClerkId(),storeId,memberCount);
+					long memberCount = distributeApiService.getClerkMemberCount(staffClerkRelationDTO.getEnterpriseId(), clerk.getClerkId(), storeId);
+					logger.info("【获取会员数】enterpriseId={},clerkId={},storeId={},count={}",staffClerkRelationDTO.getEnterpriseId(),clerk.getClerkId(),storeId,memberCount);
 					dto.setMemberCount(memberCount);
-						}
 				}else{
 					dto.setMemberCount(0);
 				}
 			}else{
-					dto.setBindFlag(0);
 				dto.setMemberCount(0);
 			}
-				
-				
-			}else{
-				dto.setBindFlag(0);
-			}
-		}
-		
-		//查找店长clerkType
-		if(StringUtils.isEmpty(storeId)){
-		}else{
-			String storeClerkCode = "";
-			StoreDTO storeDTO = storeService.getStore(storeId);
-			if(storeDTO!=null){
-				String clerkId = storeDTO.getClerkId();
-				ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
-				if(clerkDTO!=null){
-					storeClerkCode = clerkDTO.getClerkCode();
-				}
 		}
-			if(StringUtils.isNotBlank(storeClerkCode)){
-				for(StaffDTO dto :resultlist){
-					if(storeClerkCode.equals(dto.getClerkCode())){
-						dto.setClerkType(1);
-					}
-				}
-			}
-		}
-		
-		logger.info("result   ClerkCode =================>{}",JSONObject.toJSONString(resultlist));
 		return resultResponse(HaoBanErrCode.ERR_1,resultlist);
 		
 	}