Merge branch 'feature/订单储值' into 'master'

刷新好友

See merge request !1388

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

@@ -92,6 +92,8 @@ public interface PreDealService {
      */
     public int countByTaskId(String taskId, int dataType, int status);
 
+    public int countByTaskId(String taskId);
+
     /**
      * 获取任务数量
      *

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

@@ -116,6 +116,19 @@ public class PreDealServiceImpl implements PreDealService {
     }
 
     @Override
+    public int countByTaskId(String taskId) {
+        String key = taskId+"countByTaskId" ;
+        Object o = RedisUtil.getCache(key) ;
+        if(null == o) {
+            int count = this.preDealLogMapper.countByTaskId(taskId,-1,0) ;
+            RedisUtil.setCache(key,count,60*3l);
+            return count ;
+        }else {
+            return (int) o ;
+        }
+    }
+
+    @Override
     public int countExcepAndPreByTaskId(String taskId, int dataType) {
         return preDealLogMapper.countExcepAndPreByTaskId(taskId, dataType);
     }

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

@@ -459,6 +459,14 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
             return syncCheckDTO;
         }
         TabHaobanSyncTask syncTask = syncTaskService.getSyncTask(taskId);
+
+        int status = syncTask.getStatusFlag() ;
+        if(status != 4) {
+           int count = this.preDealService.countByTaskId(taskId) ;
+           if(count <= 0) {
+               this.syncTaskService.updateTaskStatus(taskId,4) ;
+           }
+        }
         syncCheckDTO.setSyncStatus(syncTask.getStatusFlag());
 
         PreDealLogInfoDTO dealLogInfoDTO = preDealService.getLastPreDataByTaskId(taskId);