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

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

@@ -234,11 +234,11 @@ 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.getClerkName(), obj.getPhoneNumber(), obj.getNationCode(), null);
-			if(!flag){
+			String flag = syncHaobanToGicServiceApi.syncClerkToGicClerkAddNew(tab.getCommitStoreId(), obj.getClerkCode(), obj.getSex(), obj.getClerkName(), obj.getPhoneNumber(), obj.getNationCode(), null);
+			if(!"1".equals(flag)){
 				//失败
 				tab.setAuditStatus(5);
-				tab.setAuditReason("gic新增导购失败");
+				tab.setAuditReason(flag);
 				auditMapper.updateByPrimaryKeySelective(tab);	
 				if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){
 					 insertBatchLog( batchId,AuditRsultType.fail.getCode(), tab);