111

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

@@ -5,6 +5,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -26,11 +27,15 @@ public class ClerkController extends WebBaseController{
 	private ClerkService clerkService;
 	@Autowired
 	private StaffDepartmentRelatedApiService staffDepartmentRelatedApiService;
-	//导购列表
-	@RequestMapping("/clerk-list")
-	public HaobanResponse clerkList(String storeId,String bindFlag,String departmentId) {
+	//未绑定的clerkCode列表
+	@RequestMapping("/clerk-code-list")
+	public HaobanResponse clerkCodeList(String storeId,String departmentId) {
 		List<StaffDepartmentRelatedDTO> list = staffDepartmentRelatedApiService.listByDepartmentId(departmentId);
 		List<ClerkVo> result  = new ArrayList<ClerkVo>();
+		if(StringUtils.isAnyBlank(storeId,departmentId)){
+			return resultResponse(HaoBanErrCode.ERR_2);
+		}
+		String bindFlag = "0";
 		//绑定的clerk
 		if("1".equals(bindFlag)){
 			// 调陶接口获取详情数据
@@ -62,30 +67,41 @@ public class ClerkController extends WebBaseController{
 	}
 	//成员绑定
 	@RequestMapping("/staff-bind")
-	public HaobanResponse staffBind(String clerkCode,String staffDepartmentRelatedId) {
+	public HaobanResponse staffBind(String toClerkCode,String fromStaffDepartmentRelatedId) {
+		if(StringUtils.isAnyBlank(toClerkCode,fromStaffDepartmentRelatedId)){
+			return resultResponse(HaoBanErrCode.ERR_2);
+		}
+		//将指定人绑定clerkCode
 		StaffDepartmentRelatedDTO dto = new StaffDepartmentRelatedDTO();
-		dto.setStaffDepartmentRelatedId(staffDepartmentRelatedId);
-		dto.setClerkCode(clerkCode);
+		dto.setStaffDepartmentRelatedId(fromStaffDepartmentRelatedId);
+		dto.setClerkCode(toClerkCode);
 		dto.setUpdateTime(new Date());
 		staffDepartmentRelatedApiService.updateById(dto);
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}
 	//成员换绑定
 	@RequestMapping("/clerk-unbind")
-	public HaobanResponse clerkUnbind(String clerkCode,String staffDepartmentRelatedId) {
-		StaffDepartmentRelatedDTO one = staffDepartmentRelatedApiService.getOneByClerkCode(clerkCode);
+	public HaobanResponse clerkUnbind(String fromClerkCode,String toClerkCode) {
+		if(StringUtils.isAnyBlank(fromClerkCode,toClerkCode)){
+			return resultResponse(HaoBanErrCode.ERR_2);
+		}
+		//将别人clerkCode置空
+		StaffDepartmentRelatedDTO one = staffDepartmentRelatedApiService.getOneByClerkCode(toClerkCode);
 		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);
+		//将别人的clerkCode换到自己上面
+		StaffDepartmentRelatedDTO two = staffDepartmentRelatedApiService.getOneByClerkCode(fromClerkCode);
+		if(two != null){
+			//存在，则先置空
+			two.setClerkCode(toClerkCode);
+			two.setClerkCode(toClerkCode);
+			two.setUpdateTime(new Date());
+			staffDepartmentRelatedApiService.updateById(two);
+		}
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}