111

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

@@ -25,6 +25,7 @@ import com.gic.haoban.communicate.api.service.SyncHaobanToGicServiceApi;
 import com.gic.haoban.manage.api.dto.AuditDTO;
 import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
 import com.gic.haoban.manage.api.dto.StaffDTO;
+import com.gic.haoban.manage.api.enums.AuditRsultType;
 import com.gic.haoban.manage.api.enums.AuditType;
 import com.gic.haoban.manage.api.service.AuditApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
@@ -210,25 +211,31 @@ public class AuditController extends WebBaseController{
 			if(audit.getAuditType() == AuditType.CLERK_BIND.getCode()){
 				//导购绑定
 				StaffClerkRelationDTO staffClerkRelation  = staffClerkRelationApiService.getByCodeAndEnterpriseId(clerkCode,enterpriseId);
-				ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
-				if(clerkDTO == null){
+				StaffClerkRelationDTO have = staffClerkRelationApiService.getOneByStoreIdAndStaffId(storeId, auditStaffId);
+				if(have !=null){
 					audit.setAuditStatus(5);
-					audit.setAuditReason("gic已删除该导购");
+					audit.setAuditReason("该成员在该门店下已经绑定过一个导购了");
 				}else{
-					if(staffClerkRelation == null){
-						staffClerkRelation = new StaffClerkRelationDTO();
+					ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
+					if(clerkDTO == null){
+						audit.setAuditStatus(5);
+						audit.setAuditReason("gic已删除该导购");
+					}else{
+						if(staffClerkRelation == null){
+							staffClerkRelation = new StaffClerkRelationDTO();
+						}
+						staffClerkRelation.setEnterpriseId(enterpriseId);
+						staffClerkRelation.setClerkCode(clerkCode);
+						staffClerkRelation.setClerkId(clerkId);
+						staffClerkRelation.setStoreId(storeId);
+						staffClerkRelation.setWxEnterpriseId(wxEnterpriseId);
+						staffClerkRelation.setWxUserId(wxUserId);
+						staffClerkRelation.setStaffId(auditStaffId);
+						staffClerkRelationApiService.insertOrUpdate(staffClerkRelation);
+						audit.setAuditStatus(1);
+						//发送消息
+						staffDepartmentRelatedApiService.sendClerkBind(clerkId, clerkCode, auditStatus, auditReason);
 					}
-					staffClerkRelation.setEnterpriseId(enterpriseId);
-					staffClerkRelation.setClerkCode(clerkCode);
-					staffClerkRelation.setClerkId(clerkId);
-					staffClerkRelation.setStoreId(storeId);
-					staffClerkRelation.setWxEnterpriseId(wxEnterpriseId);
-					staffClerkRelation.setWxUserId(wxUserId);
-					staffClerkRelation.setStaffId(auditStaffId);
-					staffClerkRelationApiService.insertOrUpdate(staffClerkRelation);
-					audit.setAuditStatus(1);
-					//发送消息
-					staffDepartmentRelatedApiService.sendClerkBind(clerkId, clerkCode, auditStatus, auditReason);
 				}
 			}
 			if(audit.getAuditType() == AuditType.CLERK_ADD.getCode()){