同步处理 死循环处理

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

@@ -130,9 +130,9 @@ public class GroupSyncOperation implements BaseSyncOperation {
     @Override
     public void dealException(String taskId, String dataId, String enterpriseId, String reason) {
         List<String> ids = storeGroupService.getStoreGroupIdsByParentId(enterpriseId, dataId);
+        preDealService.updateStatusByDataId(taskId, dataId, PreDealStatusEnum.exception.getVal(), reason);
         if (CollectionUtils.isEmpty(ids)) {
             logger.info("下面层级不存在");
-            preDealService.updateStatusByDataId(taskId, dataId, PreDealStatusEnum.exception.getVal(), reason);
             //todo 是否需要加锁判断
             return;
         }
@@ -148,11 +148,7 @@ public class GroupSyncOperation implements BaseSyncOperation {
 
     @Override
     public void dealSuccess(String taskId, String dataId, String enterpriseId, String wxEnterpriseId) {
-        boolean b = preDealService.updateStatusByDataId(taskId, dataId, PreDealStatusEnum.computed.getVal(), "成功");
-        if (!b) {
-            logger.info("成功修改错误！{}", dataId);
-            return;
-        }
+
         List<StoreDTO> storeDTOS = storeService.listStoreByStoreGroupId(dataId);
         List<TabHaobanPreDealLog> hasExists = preDealService.listByPDataId(taskId, dataId, -1);
         Set<String> hasDatas = new HashSet<>();
@@ -182,7 +178,11 @@ public class GroupSyncOperation implements BaseSyncOperation {
             }).collect(Collectors.toList());
             preDealService.insert(preDealLogList);
         }
-
+        boolean b = preDealService.updateStatusByDataId(taskId, dataId, PreDealStatusEnum.computed.getVal(), "成功");
+        if (!b) {
+            logger.info("成功修改错误！{}", dataId);
+            return;
+        }
         List<TabHaobanPreDealLog> list = preDealService.listReByPDataId(taskId, dataId);
         if (CollectionUtils.isNotEmpty(list)) {
             Set<String> mid = list.stream().map(tab -> tab.getDataId()).collect(Collectors.toSet());

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

@@ -179,11 +179,7 @@ public class QywxGroupSyncOperation implements BaseSyncOperation {
 
     @Override
     public void dealSuccess(String taskId, String dataId, String enterpriseId, String wxEnterpriseId) {
-        boolean b = preDealService.updateStatusByDataId(taskId, dataId, PreDealStatusEnum.computed.getVal(), "成功");
-        if (!b) {
-            logger.info("成功修改错误！{}", dataId);
-            return;
-        }
+
         WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
         List<UserDTO> list = this.qywxUserApiService.listSelfDepartmentUser(wxEnterpriseDTO.getCorpid(), wxEnterpriseDTO.getContactSecret(), dataId, 0);
 
@@ -209,7 +205,11 @@ public class QywxGroupSyncOperation implements BaseSyncOperation {
             }).collect(Collectors.toList());
             preDealService.insert(preDealLogList);
         }
-
+        boolean b = preDealService.updateStatusByDataId(taskId, dataId, PreDealStatusEnum.computed.getVal(), "成功");
+        if (!b) {
+            logger.info("成功修改错误！{}", dataId);
+            return;
+        }
         List<TabHaobanPreDealLog> preList = preDealService.listReByPDataId(taskId, dataId);
         if (CollectionUtils.isNotEmpty(preList)) {
             Set<String> mid = preList.stream().map(tab -> tab.getDataId()).collect(Collectors.toSet());

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

@@ -142,11 +142,7 @@ public class StoreSyncOperation implements BaseSyncOperation {
 
     @Override
     public void dealSuccess(String taskId, String dataId, String enterpriseId, String wxEnterpriseId) {
-        boolean b = preDealService.updateStatusByDataId(taskId, dataId, PreDealStatusEnum.computed.getVal(), "成功");
-        if (!b) {
-            logger.info("成功修改错误！{}", dataId);
-            return;
-        }
+
         List<ClerkListDTO> clerks = clerkService.getClerkByStoreId(enterpriseId, dataId);
         List<TabHaobanPreDealLog> hasExists = preDealService.listByPDataId(taskId, dataId, -1);
         Set<String> hasDatas = new HashSet<>();
@@ -175,7 +171,11 @@ public class StoreSyncOperation implements BaseSyncOperation {
             }).collect(Collectors.toList());
             preDealService.insert(preDealLogList);
         }
-
+        boolean b = preDealService.updateStatusByDataId(taskId, dataId, PreDealStatusEnum.computed.getVal(), "成功");
+        if (!b) {
+            logger.info("成功修改错误！{}", dataId);
+            return;
+        }
         checkDepartmentTask(taskId);
 
     }