Merge remote-tracking branch 'origin/developer' into developer

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

@@ -170,16 +170,30 @@ public class AuditApiServiceImpl implements AuditApiService{
 				logger.info("code已存在");
 				tab.setAuditStatus(5);
 				auditMapper.updateByPrimaryKeySelective(tab);	
+				if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){
+					 insertBatchLog( batchId,AuditRsultType.fail.getCode(),tab);
+				}
 				return "0";
 			}else{
-				staffClerkRelation = new StaffClerkRelationDTO();
-				staffClerkRelation.setEnterpriseId(tab.getEnterpriseId());
-				staffClerkRelation.setClerkCode(obj.getClerkCode());
-				staffClerkRelation.setClerkId(obj.getClerkId());
-				staffClerkRelation.setStoreId(tab.getCommitStoreId());
-				staffClerkRelation.setWxEnterpriseId(tab.getWxEnterpriseId());
-				staffClerkRelation.setWxUserId(obj.getWxUserId());
-				staffClerkRelationApiService.insert(staffClerkRelation);
+				ClerkDTO clerkDTO = clerkService.getClerkByClerkId(obj.getClerkId());
+				if(clerkDTO == null){
+					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";
+				}else{
+					staffClerkRelation = new StaffClerkRelationDTO();
+					staffClerkRelation.setEnterpriseId(tab.getEnterpriseId());
+					staffClerkRelation.setClerkCode(obj.getClerkCode());
+					staffClerkRelation.setClerkId(obj.getClerkId());
+					staffClerkRelation.setStoreId(tab.getCommitStoreId());
+					staffClerkRelation.setWxEnterpriseId(tab.getWxEnterpriseId());
+					staffClerkRelation.setWxUserId(obj.getWxUserId());
+					staffClerkRelationApiService.insert(staffClerkRelation);
+				}
 			}
 			if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){
 				 insertBatchLog( batchId,AuditRsultType.success.getCode(), tab);
@@ -190,21 +204,32 @@ public class AuditApiServiceImpl implements AuditApiService{
 			//门店导购新增
 			String oldValue = tab.getOldValue();
 			AuditStaffDTO obj = JSONObject.parseObject(oldValue,AuditStaffDTO.class);
-			boolean flag = syncHaobanToGicServiceApi.syncClerkToGicClerkAdd(tab.getCommitStoreId(), obj.getClerkCode(), obj.getSex(), obj.getStaffName(), obj.getPhoneNumber(), obj.getNationCode(), null);
-			if(!flag){
-				//失败
+			ClerkDTO clerkDTO = clerkService.getClerkByClerkId(obj.getClerkId());
+			if(clerkDTO == null){
 				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{
-				//成功
-				if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){
-					 insertBatchLog( batchId,1, tab);
+				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, "");
 				}
-				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

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
+import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.EntityUtil;
 import com.gic.haoban.base.api.common.BasePageInfo;
@@ -209,27 +210,39 @@ public class AuditController extends WebBaseController{
 				if(staffClerkRelation != null){
 					return resultResponse(HaoBanErrCode.ERR_111117);
 				}else{
-					staffClerkRelation = new StaffClerkRelationDTO();
-					staffClerkRelation.setEnterpriseId(enterpriseId);
-					staffClerkRelation.setClerkCode(clerkCode);
-					staffClerkRelation.setClerkId(clerkId);
-					staffClerkRelation.setStoreId(storeId);
-					staffClerkRelation.setWxEnterpriseId(wxEnterpriseId);
-					staffClerkRelation.setWxUserId(wxUserId);
-					staffClerkRelationApiService.insert(staffClerkRelation);
-					audit.setAuditStatus(1);
+					ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
+					if(clerkDTO == null){
+						audit.setAuditStatus(5);
+						audit.setAuditReason("gic已删除该导购");
+					}else{
+						staffClerkRelation = new StaffClerkRelationDTO();
+						staffClerkRelation.setEnterpriseId(enterpriseId);
+						staffClerkRelation.setClerkCode(clerkCode);
+						staffClerkRelation.setClerkId(clerkId);
+						staffClerkRelation.setStoreId(storeId);
+						staffClerkRelation.setWxEnterpriseId(wxEnterpriseId);
+						staffClerkRelation.setWxUserId(wxUserId);
+						staffClerkRelationApiService.insert(staffClerkRelation);
+						audit.setAuditStatus(1);
+						//发送消息
+						staffDepartmentRelatedApiService.sendClerkBind(clerkId, clerkCode, auditStatus, auditReason);
+					}
 				}
-				//发送消息
-				staffDepartmentRelatedApiService.sendClerkBind(clerkId, clerkCode, auditStatus, auditReason);
 			}
 			if(audit.getAuditType() == AuditType.CLERK_ADD.getCode()){
 				//导购新增
-				boolean flag = syncHaobanToGicServiceApi.syncClerkToGicClerkAdd(storeId, clerkCode, sex, staff.getStaffName(), phoneNumber, nationCode, null);
-				if(!flag){
-					return resultResponse(HaoBanErrCode.ERR_10010);
+				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);
 				}
-				audit.setAuditStatus(1);
-				staffDepartmentRelatedApiService.sendClerkAdd(clerkId, clerkCode, auditStatus, auditReason);
 			}
 			if(audit.getAuditType() == AuditType.CLERK_DEL.getCode()){
 				//导购删除