同步优化初步3-同步成员重试

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

@@ -259,6 +259,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
             dealLog.setpDataId(dto.getParentDepartmentId());
             dealLog.setDataType(1);
             dealLog.setStatusFlag(0);
+            dealLog.setEnterpriseId(dto.getEnterpriseId());
             dealLog.setTaskId(taskId);
             dealLog.setWxEnterpriseId(wxEnterpriseId);
             return dealLog;

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

@@ -13,6 +13,7 @@ import com.gic.haoban.manage.api.dto.DepartmentDTO;
 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.DealSyncOperationApiService;
 import com.gic.haoban.manage.api.service.DepartmentApiService;
 import com.gic.haoban.manage.service.entity.TabHaobanDepartment;
 import com.gic.haoban.manage.service.entity.TabHaobanPreDealLog;
@@ -59,6 +60,9 @@ public class GroupSyncOperation implements BaseSyncOperation {
     @Autowired
     private StoreService storeService;
 
+    @Autowired
+    private DealSyncOperationApiService dealSyncOperationApiService;
+
     @Override
     public void dealSingleByMq(DealParamMqDTO dealParamMqDTO, TabHaobanPreDealLog dataPre) {
         logger.info("处理单条部门分组：{}", JSONObject.toJSONString(dealParamMqDTO));
@@ -180,6 +184,7 @@ public class GroupSyncOperation implements BaseSyncOperation {
             List<TabHaobanPreDealLog> dealLogs = preDealService.listByTaskId(taskId, PreDealTypeEnum.store.getVal(), PreDealStatusEnum.pre.getVal());
             if (CollectionUtils.isEmpty(dealLogs)) {
                 syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.compute.getVal());
+                dealSyncOperationApiService.unlockTask(syncTask.getWxEnterpriseId());
             } else {
                 logger.info("处理门店开始");
                 Set<String> dataIds = dealLogs.stream().map(TabHaobanPreDealLog::getDataId).collect(Collectors.toSet());

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

@@ -177,7 +177,7 @@ public class StoreSyncOperation implements BaseSyncOperation {
             List<TabHaobanPreDealLog> dealLogs = preDealService.listByTaskId(taskId, PreDealTypeEnum.clerk.getVal(), PreDealStatusEnum.pre.getVal());
             if (CollectionUtils.isEmpty(dealLogs)) {
                 syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.compute.getVal());
-                dealSyncOperationApiService.unlockTask(taskId);
+                dealSyncOperationApiService.unlockTask(syncTask.getWxEnterpriseId());
             } else {
                 logger.info("处理成员开始");
                 Set<String> dataIds = dealLogs.stream().map(TabHaobanPreDealLog::getDataId).collect(Collectors.toSet());