111

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

@@ -296,42 +296,21 @@ public class ClerkController extends WebBaseController{
 			//只删除gic那边的
 			String[] clerkIdArr = clerkIds.split(",");
 			for (String clerkId : clerkIdArr) {
+				ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
+				if(clerkDTO == null){
+					logger.info("导购不存在：{}",clerkId);
+					continue;
+				}
+				if(distributeApiService.getClerkMemberCount(clerkDTO.getEnterpriseId(), clerkId, storeId) == 0){
+					if(clerkDTO.getClerkType() == 1){
+						logger.info("店长不能删除：{}",clerkId);
+						continue;
+					}
+				}
 				syncHaobanToGicServiceApi.delGicClerk(clerkId);
 			}
 		}
 		
-		
-//		DepartmentDTO departmentDTO = departmentApiService.selectByRelatedId(storeId);
-//		if(departmentDTO == null){
-//			return resultResponse(HaoBanErrCode.ERR_10009);
-//		}
-//		if(StringUtils.isBlank(staffDepartmentRelatedIds)){
-//			return resultResponse(HaoBanErrCode.ERR_2);
-//		}
-//		String[] staffDepartmentRelatedIdArr = staffDepartmentRelatedIds.split(",");
-//		boolean flag = false;
-//		for (String staffDepartmentRelatedId : staffDepartmentRelatedIdArr) {
-//			StaffDepartmentRelatedDTO related = staffDepartmentRelatedApiService.getByStaffDepartmentRelatedId(staffDepartmentRelatedId);
-//			if(related == null){
-//				flag = true;
-//				continue;
-//			}
-//			if(StringUtils.isBlank(related.getClerkCode())){
-//				staffApiService.del(staffDepartmentRelatedId);
-//			}else{
-//				ClerkDTO clerk = clerkService.getClerkByClerkCode(departmentDTO.getEnterpriseId(), related.getClerkCode());
-//				if(clerk != null && distributeApiService.getClerkMemberCount(departmentDTO.getEnterpriseId(), clerk.getClerkId(), storeId) == 0){
-//					if(clerk.getClerkType() == 1){
-//						continue;
-//					}
-//					syncHaobanToGicServiceApi.delGicClerk(clerk.getClerkId());
-//					staffApiService.del(staffDepartmentRelatedId);
-//				}
-//			}
-//		}
-//		if(flag){
-//			return resultResponse(HaoBanErrCode.ERR_999);
-//		}
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}