111

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/AuditApiServiceImpl.java

@@ -216,32 +216,21 @@ public class AuditApiServiceImpl implements AuditApiService{
 			//门店导购新增
 			String oldValue = tab.getOldValue();
 			AuditStaffDTO obj = JSONObject.parseObject(oldValue,AuditStaffDTO.class);
-			ClerkDTO clerkDTO = clerkService.getClerkByClerkId(obj.getClerkId());
-			if(clerkDTO == null){
+			boolean flag = syncHaobanToGicServiceApi.syncClerkToGicClerkAdd(tab.getCommitStoreId(), obj.getClerkCode(), obj.getSex(), obj.getStaffName(), obj.getPhoneNumber(), obj.getNationCode(), null);
+			if(!flag){
+				//失败
 				tab.setAuditStatus(5);
-				tab.setAuditReason("gic已删除该导购");
 				auditMapper.updateByPrimaryKeySelective(tab);	
 				if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){
-					 insertBatchLog( batchId,AuditRsultType.fail.getCode(),tab);
-				}
-				return "0";
+					 insertBatchLog( batchId,AuditRsultType.fail.getCode(), tab);
+					 return "0";
+				}			
 			}else{
-				boolean flag = syncHaobanToGicServiceApi.syncClerkToGicClerkAdd(tab.getCommitStoreId(), obj.getClerkCode(), obj.getSex(), obj.getStaffName(), obj.getPhoneNumber(), obj.getNationCode(), null);
-				if(!flag){
-					//失败
-					tab.setAuditStatus(5);
-					auditMapper.updateByPrimaryKeySelective(tab);	
-					if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){
-						 insertBatchLog( batchId,AuditRsultType.fail.getCode(), tab);
-						 return "0";
-					}			
-				}else{
-					//成功
-					if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){
-						 insertBatchLog( batchId,1, tab);
-					}
-					staffDepartmentRelatedApiService.sendClerkAdd(obj.getClerkId(), obj.getClerkCode(), 1, "");
+				//成功
+				if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){
+					 insertBatchLog( batchId,1, tab);
 				}
+				staffDepartmentRelatedApiService.sendClerkAdd(obj.getClerkId(), obj.getClerkCode(), 1, "");
 			}
 
 		}else if(auditType == AuditType.CLERK_DEL.getCode()){

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

@@ -231,18 +231,12 @@ public class AuditController extends WebBaseController{
 			}
 			if(audit.getAuditType() == AuditType.CLERK_ADD.getCode()){
 				//导购新增
-				ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
-				if(clerkDTO == null){
-					audit.setAuditStatus(5);
-					audit.setAuditReason("gic已删除该导购");
-				}else{
-					boolean flag = syncHaobanToGicServiceApi.syncClerkToGicClerkAdd(storeId, clerkCode, sex, staff.getStaffName(), phoneNumber, nationCode, null);
-					if(!flag){
-						return resultResponse(HaoBanErrCode.ERR_10010);
-					}
-					audit.setAuditStatus(1);
-					staffDepartmentRelatedApiService.sendClerkAdd(clerkId, clerkCode, auditStatus, auditReason);
+				boolean flag = syncHaobanToGicServiceApi.syncClerkToGicClerkAdd(storeId, clerkCode, sex, staff.getStaffName(), phoneNumber, nationCode, null);
+				if(!flag){
+					return resultResponse(HaoBanErrCode.ERR_10010);
 				}
+				audit.setAuditStatus(1);
+				staffDepartmentRelatedApiService.sendClerkAdd(clerkId, clerkCode, auditStatus, auditReason);
 			}
 			if(audit.getAuditType() == AuditType.CLERK_DEL.getCode()){
 				//导购删除