fix

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

@@ -150,7 +150,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
         	
         } else if(dataPre.getDataType().equals(PreDealTypeEnum.friend_merge.getVal())){
         	operationMap.get("friendMergeSyncOperation").dealSingleByMq(dealParamMqDTO, dataPre);
-        	logger.info("好友处理：{}", params);
+        	logger.info("好友合并处理：{}", params);
         	
         }  else {
             logger.info("不是正常数据:{}", params);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/FriendMergeSyncOperation.java

@@ -32,6 +32,8 @@ public class FriendMergeSyncOperation implements BaseSyncOperation{
 			String res = memberUnionidRelatedApiService.addExternal(pojo);
 			if(StringUtils.isBlank(res)){
 				dealSuccess(dealParamMqDTO.getTaskId(), dataPre.getDataId(), null, null);
+			}else{
+				dealException(dealParamMqDTO.getTaskId(), dealParamMqDTO.getData(), dataPre.getEnterpriseId(), "好友不存在");
 			}
 		} catch (Exception e) {
 			e.printStackTrace();

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/FriendSyncOperation.java

@@ -86,6 +86,7 @@ public class FriendSyncOperation implements BaseSyncOperation {
 		pojo.setEnterpriseId(staffClerkRelationDTO.getEnterpriseId());
 		pojo.setStoreId(mainStore.getStoreId());
 		pojo.setClerkId(staffClerkRelationDTO.getClerkId());
+		pojo.setWxUserId(wxUserId);
 		if(pojo != null){
 			dealSuccess(taskId, externalUserId,JSON.toJSONString(pojo),wxEnterpriseId);
 		}

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/SelfFriendSyncOperation.java

@@ -97,6 +97,7 @@ public class SelfFriendSyncOperation implements BaseSyncOperation{
 		pojo.setEnterpriseId(staffClerkRelationDTO.getEnterpriseId());
 		pojo.setStoreId(mainStore.getStoreId());
 		pojo.setClerkId(staffClerkRelationDTO.getClerkId());
+		pojo.setWxUserId(wxUserId);
 			
 		//新增导购和外部联系人关系
 		String clerkCode = staffClerkRelationDTO.getClerkCode();