Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

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

@@ -27,5 +27,6 @@ public interface StaffDepartmentRelatedApiService {
 
 	StaffDepartmentRelatedDTO getOneByClerkCodeAndDepartmentId(String clerkCode, String departmentId);
 
+	StaffDepartmentRelatedDTO getOneByStaffIdAndDepartmentId(String staffId, String departmentId);
 
 }

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

@@ -85,7 +85,15 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 		StaffDepartmentRelatedDTO dto = EntityUtil.changeEntity(StaffDepartmentRelatedDTO.class, tab);
 		return dto;
 	}
-
-
+	@Override
+	public StaffDepartmentRelatedDTO getOneByStaffIdAndDepartmentId(String staffId, String departmentId) {
+		TabHaobanStaffDepartmentRelated tab = staffDepartmentRelatedMapper.getDepartmentIdAndStaffId(staffId,departmentId);
+		if(tab== null){
+			return null;
+		}
+		StaffDepartmentRelatedDTO dto = EntityUtil.changeEntity(StaffDepartmentRelatedDTO.class, tab);
+		return dto;
+	}
+	
 
 }

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

@@ -174,6 +174,43 @@ public class ClerkController extends WebBaseController{
 	}
 	//成员换绑定
 	@RequestMapping("/clerk-unbind")
+	public HaobanResponse clerkUnbind(String departmentId,String fromClerkCode,String toStaffId,int manager) {
+		if(StringUtils.isAnyBlank(fromClerkCode,toStaffId)){
+			return resultResponse(HaoBanErrCode.ERR_2);
+		}
+		if(manager == 1){
+			//店长操作
+			//第一个点击的人的clerkCode置空
+			StaffDepartmentRelatedDTO one = staffDepartmentRelatedApiService.getOneByClerkCodeAndDepartmentId(fromClerkCode,departmentId);
+			if(one != null){
+				//存在，则先置空
+				one.setClerkCode(null);
+				one.setUpdateTime(new Date());
+				staffDepartmentRelatedApiService.deleteCode(one);
+			}
+			StaffDepartmentRelatedDTO dto = staffDepartmentRelatedApiService.getOneByStaffIdAndDepartmentId(toStaffId, departmentId);
+				//存在，则先置空
+			dto.setClerkCode(fromClerkCode);
+			dto.setUpdateTime(new Date());
+			staffDepartmentRelatedApiService.updateById(dto);
+		}else{
+			//把别人的的clerkCode置空
+			StaffDepartmentRelatedDTO one = staffDepartmentRelatedApiService.getOneByClerkCodeAndDepartmentId(fromClerkCode,departmentId);
+			if(one != null){
+				//存在，则先置空
+				one.setClerkCode(null);
+				one.setUpdateTime(new Date());
+				staffDepartmentRelatedApiService.deleteCode(one);
+			}
+			StaffDepartmentRelatedDTO dto = staffDepartmentRelatedApiService.getOneByStaffIdAndDepartmentId(toStaffId, departmentId);
+			dto.setClerkCode(fromClerkCode);
+			dto.setUpdateTime(new Date());
+			staffDepartmentRelatedApiService.updateById(dto);
+		}
+		return resultResponse(HaoBanErrCode.ERR_1);
+	}
+	//成员换绑定
+	@RequestMapping("/clerk-unbind22222")
 	public HaobanResponse clerkUnbind(String departmentId,String fromClerkCode,String toClerkCode) {
 		if(StringUtils.isAnyBlank(fromClerkCode,toClerkCode)){
 			return resultResponse(HaoBanErrCode.ERR_2);