fix

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

@@ -94,7 +94,7 @@ public class FriendClerkSyncOperation implements BaseSyncOperation {
             } else {
                 dealSuccess(dealParamMqDTO.getTaskId(), dealParamMqDTO.getData(), dataPre.getEnterpriseId(), dataPre.getWxEnterpriseId());
             }
-			checkDepartmentTask(taskId);
+//			checkDepartmentTask(taskId);
 		}
 	}
 

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

@@ -11,9 +11,14 @@ import com.alibaba.fastjson.JSONObject;
 import com.gic.haoban.manage.api.dto.DealParamMqDTO;
 import com.gic.haoban.manage.api.dto.ExternalUserDTO;
 import com.gic.haoban.manage.api.enums.PreDealStatusEnum;
+import com.gic.haoban.manage.api.enums.PreDealTypeEnum;
+import com.gic.haoban.manage.api.enums.SyncTaskStatusEnum;
 import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
 import com.gic.haoban.manage.service.entity.TabHaobanPreDealLog;
+import com.gic.haoban.manage.service.entity.TabHaobanSyncTask;
 import com.gic.haoban.manage.service.service.PreDealService;
+import com.gic.haoban.manage.service.service.SyncTaskService;
+import com.gic.redis.data.util.RedisUtil;
 
 @Service
 public class FriendMergeSyncOperation implements BaseSyncOperation{
@@ -22,10 +27,13 @@ public class FriendMergeSyncOperation implements BaseSyncOperation{
 	private MemberUnionidRelatedApiService memberUnionidRelatedApiService;
 	@Autowired
 	private PreDealService preDealService;
+	@Autowired
+	private SyncTaskService syncTaskService;
 	@Override
 	public void dealSingleByMq(DealParamMqDTO dealParamMqDTO, TabHaobanPreDealLog dataPre) {
 		String reason = "";
 		boolean dealFlag = true;
+		String taskId = dealParamMqDTO.getTaskId();
 		try {
 			String dataContent = dataPre.getDataContent();
 			ExternalUserDTO pojo = JSON.parseObject(dataContent, ExternalUserDTO.class);
@@ -43,7 +51,8 @@ public class FriendMergeSyncOperation implements BaseSyncOperation{
 		}finally {
 			if (!dealFlag) {
                dealException(dealParamMqDTO.getTaskId(), dealParamMqDTO.getData(), dataPre.getEnterpriseId(), reason);
-           } 
+           }
+			checkDepartmentTask(taskId);		
 		}
 		
 	}
@@ -62,7 +71,16 @@ public class FriendMergeSyncOperation implements BaseSyncOperation{
 
 	@Override
 	public void checkDepartmentTask(String taskId) {
-		
+		String key = "sync_wx_lock_";
+		boolean b = preDealService.checkTask(taskId, PreDealTypeEnum.friend_merge.getVal());
+        if (!b) {
+            return;
+        }
+        logger.info("好友合并成功:{}", taskId);
+        TabHaobanSyncTask syncTask = syncTaskService.getSyncTask(taskId);
+        //同步成功 进入门店处理
+    	syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.compute.getVal());
+    	RedisUtil.delCache(key + syncTask.getWxEnterpriseId());
 	}
 
 }