111

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

@@ -335,51 +335,53 @@ public class ClerkController extends WebBaseController{
 	//店长转让
 	@RequestMapping("/clerk-manager-tranfer")
 	public HaobanResponse clerkManagerTranfer(String departmentId,String fromClerkCode,String toStaffDepartmentRelatedId) {
+
 		if(StringUtils.isAnyBlank(fromClerkCode,toStaffDepartmentRelatedId)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
 		DepartmentDTO departmentDTO = departmentApiService.selectById(departmentId);
 		String storeId = departmentDTO.getRelatedId();
 		StaffDepartmentRelatedDTO oldStaffDepartmentRelatedDTO = staffDepartmentRelatedApiService.getByStaffDepartmentRelatedId(toStaffDepartmentRelatedId);
-
-		//老店长清空
+		if(StringUtils.isNotEmpty(oldStaffDepartmentRelatedDTO.getClerkCode())){
+			//新店长更新gic姓名
+			List<String> clerkCodes = new ArrayList<>();
+			clerkCodes.add(oldStaffDepartmentRelatedDTO.getClerkCode());
+			List<ClerkDTO> list = clerkService.listClerk(storeId, clerkCodes, true);
+			for(ClerkDTO clerkDTO :list){
+				clerkDTO.setPhoneNumber("--");
+				clerkDTO.setClerkName("--");
+				clerkService.updateClerk(clerkDTO);
+			}
+		}
+		//老店长
 		StaffDepartmentRelatedDTO one = staffDepartmentRelatedApiService.getOneByClerkCodeAndDepartmentId(fromClerkCode,departmentId);
 		if(one != null){
-			//存在，则先置空
+			//老店长清空好办这边code
 			one.setClerkCode(null);
 			one.setUpdateTime(new Date());
 			staffDepartmentRelatedApiService.deleteCode(one);
 		}
-		//将其他人更新为店长
+		//新店长更新好办code
 		StaffDepartmentRelatedDTO dto = new StaffDepartmentRelatedDTO();
 		dto.setStaffDepartmentRelatedId(toStaffDepartmentRelatedId);
 		dto.setClerkCode(fromClerkCode);
 		dto.setUpdateTime(new Date());
 		staffDepartmentRelatedApiService.updateById(dto);
 		
-		
-		//更新gic数据
-		//老店长的gic数据清空(因为老店长解绑了)
+		//老店长更新gic那边的数据为新店长数据
 		List<String> clerkCodes = new ArrayList<>();
 		clerkCodes.add(fromClerkCode);
 		List<ClerkDTO> list = clerkService.listClerk(storeId, clerkCodes, true);
+		StaffDepartmentRelatedDTO staffDepartmentRelatedDTO = staffDepartmentRelatedApiService.getByStaffDepartmentRelatedId(toStaffDepartmentRelatedId);
+		StaffDTO staffDTO = staffApiService.selectById(staffDepartmentRelatedDTO.getStaffId());
 		for(ClerkDTO clerkDTO :list){
-			clerkDTO.setPhoneNumber("--");
-			clerkDTO.setClerkName("--");
+			clerkDTO.setPhoneNumber(staffDTO.getPhoneNumber());
+			clerkDTO.setClerkName(staffDTO.getStaffName());
+			clerkDTO.setImageUrl(staffDTO.getHeadImg());
 			clerkService.updateClerk(clerkDTO);
 		}
-		//新店长gic更新clerkCode
-		if(StringUtils.isNotEmpty(oldStaffDepartmentRelatedDTO.getClerkCode())){
-			//gic姓名和手机号清空(老用户)
-			List<String> clerkCodes2 = new ArrayList<>();
-			clerkCodes.add(oldStaffDepartmentRelatedDTO.getClerkCode());
-			List<ClerkDTO> list2 = clerkService.listClerk(storeId, clerkCodes2, true);
-			for(ClerkDTO clerkDTO :list2){
-				clerkDTO.setClerkCode(fromClerkCode);
-				clerkService.updateClerk(clerkDTO);
-			}
-		}
 		
 		return resultResponse(HaoBanErrCode.ERR_1);
+	
 	}
 }