fix

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

@@ -78,8 +78,13 @@ public class FriendMergeSyncOperation implements BaseSyncOperation{
         }
         logger.info("好友合并成功:{}", taskId);
         TabHaobanSyncTask syncTask = syncTaskService.getSyncTask(taskId);
+        int errorCount = preDealService.countByTaskId(taskId, PreDealTypeEnum.friend_merge.getVal(), 3);
+        if(errorCount > 0){
+        	syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.compute.getVal());
+        }else{
+        	syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.exception_compute.getVal());
+        }
         //同步成功 进入门店处理
-    	syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.compute.getVal());
     	RedisUtil.delCache(key + syncTask.getWxEnterpriseId());
 	}
 

haoban-manage3-service/src/main/resources/mapper/SyncTaskMapper.xml

@@ -120,6 +120,9 @@
         select
         <include refid="Base_Column_List"/>
         from tab_haoban_sync_task
-        where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR} order by update_time desc
+        where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
+        and task_type != 4
+        
+         order by update_time desc
     </select>
 </mapper>
\ No newline at end of file