1111

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

@@ -121,23 +121,17 @@ public class ClerkController extends WebBaseController{
 	}
 	//成员绑定
 	@RequestMapping("/staff-bind")
-	public HaobanResponse staffBind(String clerkCode,String staffDepartmentRelatedId) {
-		if(StringUtils.isAnyBlank(clerkCode,staffDepartmentRelatedId)){
+	public HaobanResponse staffBind(String toClerkCode,String staffDepartmentRelatedId) {
+		if(StringUtils.isAnyBlank(toClerkCode,staffDepartmentRelatedId)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
+		//将指定人绑定clerkCode
 		StaffDepartmentRelatedDTO dto = new StaffDepartmentRelatedDTO();
 		dto.setStaffDepartmentRelatedId(staffDepartmentRelatedId);
-		dto.setClerkCode(clerkCode);
+		dto.setClerkCode(toClerkCode);
 		dto.setUpdateTime(new Date());
 		staffDepartmentRelatedApiService.updateById(dto);
-		
-		StoreVO storeVO = new StoreVO();
-		storeVO.setBindFlag(1);
-		storeVO.setClerkCode(clerkCode);
-		storeVO.setClerkType(0);
-		storeVO.setStaffDepartmentRelatedId(staffDepartmentRelatedId);
-		
-		return resultResponse(HaoBanErrCode.ERR_1,storeVO);
+		return resultResponse(HaoBanErrCode.ERR_1);
 	}
 	//成员解除绑定
 	@RequestMapping("/clerk-single-unbind")
@@ -145,6 +139,7 @@ public class ClerkController extends WebBaseController{
 		if(StringUtils.isAnyBlank(clerkCode)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
+		//将自己的clerkCode置空
 		StaffDepartmentRelatedDTO one = staffDepartmentRelatedApiService.getOneByClerkCode(clerkCode);
 		if(one != null){
 			//存在，则先置空
@@ -152,38 +147,32 @@ public class ClerkController extends WebBaseController{
 			one.setUpdateTime(new Date());
 			staffDepartmentRelatedApiService.deleteCode(one);
 		}
-		StoreVO storeVO = new StoreVO();
-		storeVO.setBindFlag(0);
-		storeVO.setClerkCode(null);
-		storeVO.setClerkType(0);
-		return resultResponse(HaoBanErrCode.ERR_1,storeVO);
+		return resultResponse(HaoBanErrCode.ERR_1);
 	}
 	//成员换绑定
 	@RequestMapping("/clerk-unbind")
-	public HaobanResponse clerkUnbind(String clerkCode,String staffDepartmentRelatedId) {
-		if(StringUtils.isAnyBlank(clerkCode,staffDepartmentRelatedId)){
+	public HaobanResponse clerkUnbind(String fromClerkCode,String toClerkCode) {
+		if(StringUtils.isAnyBlank(fromClerkCode,toClerkCode)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
-		StaffDepartmentRelatedDTO one = staffDepartmentRelatedApiService.getOneByClerkCode(clerkCode);
+		//将别人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);
-		
-		StoreVO storeVO = new StoreVO();
-		storeVO.setBindFlag(1);
-		storeVO.setClerkCode(clerkCode);
-		storeVO.setClerkType(0);
-		storeVO.setStaffDepartmentRelatedId(staffDepartmentRelatedId);
-		return resultResponse(HaoBanErrCode.ERR_1,storeVO);
+		//将别人的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);
 	}
 	//店长转让
 	@RequestMapping("/clerk-manager-tranfer")
@@ -198,18 +187,13 @@ public class ClerkController extends WebBaseController{
 			one.setUpdateTime(new Date());
 			staffDepartmentRelatedApiService.deleteCode(one);
 		}
-		//不存在，则更新
+		//将其他人更新为店长
 		StaffDepartmentRelatedDTO dto = new StaffDepartmentRelatedDTO();
 		dto.setStaffDepartmentRelatedId(staffDepartmentRelatedId);
 		dto.setClerkCode(clerkCode);
 		dto.setUpdateTime(new Date());
 		staffDepartmentRelatedApiService.updateById(dto);
 		
-		StoreVO storeVO = new StoreVO();
-		storeVO.setBindFlag(1);
-		storeVO.setClerkCode(clerkCode);
-		storeVO.setClerkType(0);
-		storeVO.setStaffDepartmentRelatedId(staffDepartmentRelatedId);
-		return resultResponse(HaoBanErrCode.ERR_1,storeVO);
+		return resultResponse(HaoBanErrCode.ERR_1);
 	}
 }