1111

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffDTO.java

@@ -46,9 +46,19 @@ public class StaffDTO implements Serializable{
     
     private String clerkCode;
 
+    private String staffDepartmentRelatedId;
+
     private static final long serialVersionUID = 1L;
 
-    public String getClerkCode() {
+    public String getStaffDepartmentRelatedId() {
+		return staffDepartmentRelatedId;
+	}
+
+	public void setStaffDepartmentRelatedId(String staffDepartmentRelatedId) {
+		this.staffDepartmentRelatedId = staffDepartmentRelatedId;
+	}
+
+	public String getClerkCode() {
 		return clerkCode;
 	}
 

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

@@ -26,6 +26,7 @@ import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.interceptor.WebInterceptor;
 import com.gic.haoban.manage.web.vo.ClerkVo;
+import com.gic.haoban.manage.web.vo.StoreVO;
 
 @RestController
 public class ClerkController extends WebBaseController{
@@ -104,6 +105,7 @@ public class ClerkController extends WebBaseController{
 		List<StaffDTO>  resultlist= staffApiService.listByIds(staffIds);
 		for(StaffDTO dto :resultlist){
 			if(relatedMap.get(dto.getStaffId()) != null){
+				dto.setStaffDepartmentRelatedId(relatedMap.get(dto.getStaffId()).getStaffDepartmentRelatedId());
 				if(relatedMap.get(dto.getStaffId()).getClerkCode()!=null){
 					dto.setBindFlag(1);
 					dto.setClerkCode(relatedMap.get(dto.getStaffId()).getClerkCode());
@@ -128,7 +130,34 @@ public class ClerkController extends WebBaseController{
 		dto.setClerkCode(clerkCode);
 		dto.setUpdateTime(new Date());
 		staffDepartmentRelatedApiService.updateById(dto);
-		return resultResponse(HaoBanErrCode.ERR_1);
+		
+		StoreVO storeVO = new StoreVO();
+		storeVO.setBindFlag(1);
+		storeVO.setClerkCode(clerkCode);
+		storeVO.setClerkType(0);
+		storeVO.setStaffDepartmentRelatedId(staffDepartmentRelatedId);
+		
+		return resultResponse(HaoBanErrCode.ERR_1,storeVO);
+	}
+	//成员解除绑定
+	@RequestMapping("/clerk-single-unbind")
+	public HaobanResponse clerkSingleUnbind(String clerkCode,String staffDepartmentRelatedId) {
+		if(StringUtils.isAnyBlank(clerkCode)){
+			return resultResponse(HaoBanErrCode.ERR_2);
+		}
+		StaffDepartmentRelatedDTO one = staffDepartmentRelatedApiService.getOneByClerkCode(clerkCode);
+		if(one != null){
+			//存在，则先置空
+			one.setClerkCode(null);
+			one.setUpdateTime(new Date());
+			staffDepartmentRelatedApiService.deleteCode(one);
+		}
+		StoreVO storeVO = new StoreVO();
+		storeVO.setBindFlag(0);
+		storeVO.setClerkCode(clerkCode);
+		storeVO.setClerkType(0);
+		storeVO.setStaffDepartmentRelatedId(staffDepartmentRelatedId);
+		return resultResponse(HaoBanErrCode.ERR_1,storeVO);
 	}
 	//成员换绑定
 	@RequestMapping("/clerk-unbind")
@@ -149,7 +178,13 @@ public class ClerkController extends WebBaseController{
 		dto.setClerkCode(clerkCode);
 		dto.setUpdateTime(new Date());
 		staffDepartmentRelatedApiService.updateById(dto);
-		return resultResponse(HaoBanErrCode.ERR_1);
+		
+		StoreVO storeVO = new StoreVO();
+		storeVO.setBindFlag(1);
+		storeVO.setClerkCode(clerkCode);
+		storeVO.setClerkType(0);
+		storeVO.setStaffDepartmentRelatedId(staffDepartmentRelatedId);
+		return resultResponse(HaoBanErrCode.ERR_1,storeVO);
 	}
 	//店长转让
 	@RequestMapping("/clerk-manager-tranfer")
@@ -170,6 +205,12 @@ public class ClerkController extends WebBaseController{
 		dto.setClerkCode(clerkCode);
 		dto.setUpdateTime(new Date());
 		staffDepartmentRelatedApiService.updateById(dto);
-		return resultResponse(HaoBanErrCode.ERR_1);
+		
+		StoreVO storeVO = new StoreVO();
+		storeVO.setBindFlag(1);
+		storeVO.setClerkCode(clerkCode);
+		storeVO.setClerkType(0);
+		storeVO.setStaffDepartmentRelatedId(staffDepartmentRelatedId);
+		return resultResponse(HaoBanErrCode.ERR_1,storeVO);
 	}
 }