111

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

@@ -30,7 +30,7 @@ public class ClerkController extends WebBaseController{
 	private StaffApiService staffApiService;
 	@Autowired
 	private StaffDepartmentRelatedApiService staffDepartmentRelatedApiService;
-	
+	//导购列表
 	@RequestMapping("/clerk-list")
 	public HaobanResponse clerkList(String storeId,String bindFlag,String departmentId) {
 		List<StaffDepartmentRelatedDTO> list = staffDepartmentRelatedApiService.listByDepartmentId(departmentId);
@@ -54,17 +54,21 @@ public class ClerkController extends WebBaseController{
 		if("1".equals(bindFlag)){
 			// 调陶接口获取详情数据
 			if(CollectionUtil.isNotEmpty(list)){
-				List<String> clerkCodes = list.stream().map(s->s.getClerkCode()).collect(Collectors.toList());
-				List<ClerkDTO> clerkList = clerkService.listClerk(storeId, clerkCodes, true);
-				result = EntityUtil.changeEntityListByJSON(ClerkVo.class, clerkList);
+				List<String> clerkCodes = list.stream().filter(s->s.getClerkCode()!=null).map(s->s.getClerkCode()).collect(Collectors.toList());
+				if(CollectionUtil.isNotEmpty(clerkCodes)){
+					List<ClerkDTO> clerkList = clerkService.listClerk(storeId, clerkCodes, true);
+					result = EntityUtil.changeEntityListByJSON(ClerkVo.class, clerkList);
+				}
 			}
 		}else{
 			//未绑定的clerk
 			// 调陶接口获取详情数据
 			if(CollectionUtil.isNotEmpty(list)){
-				List<String> clerkCodes = list.stream().map(s->s.getClerkCode()).collect(Collectors.toList());
-				List<ClerkDTO> clerkList = clerkService.listClerk(storeId, clerkCodes, false);
-				result = EntityUtil.changeEntityListByJSON(ClerkVo.class, clerkList);
+				List<String> clerkCodes = list.stream().filter(s->s.getClerkCode()!=null).map(s->s.getClerkCode()).collect(Collectors.toList());
+				if(CollectionUtil.isNotEmpty(clerkCodes)){
+					List<ClerkDTO> clerkList = clerkService.listClerk(storeId, clerkCodes, false);
+					result = EntityUtil.changeEntityListByJSON(ClerkVo.class, clerkList);
+				}
 			}
 		}
 		return resultResponse(HaoBanErrCode.ERR_1,result);
@@ -107,5 +111,22 @@ public class ClerkController extends WebBaseController{
 		staffDepartmentRelatedApiService.updateById(dto);
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}
-
+	//店长转让
+	@RequestMapping("/clerk-manager-tranfer")
+	public HaobanResponse clerkManagerTranfer(String clerkCode,String storeId,String staffDepartmentRelatedId) {
+		StaffDepartmentRelatedDTO one = staffDepartmentRelatedApiService.getOneByClerkCode(clerkCode);
+		if(one != null){
+			//存在，则先置空
+			one.setClerkCode(null);
+			one.setUpdateTime(new Date());
+			staffDepartmentRelatedApiService.deleteCode(one);
+		}
+		//不存在，则更新
+		StaffDepartmentRelatedDTO dto = new StaffDepartmentRelatedDTO();
+		dto.setStaffDepartmentRelatedId(staffDepartmentRelatedId);
+		dto.setClerkCode(clerkCode);
+		dto.setUpdateTime(new Date());
+		staffDepartmentRelatedApiService.updateById(dto);
+		return resultResponse(HaoBanErrCode.ERR_1);
+	}
 }