Merge remote-tracking branch 'origin/developer' into developer

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

@@ -447,10 +447,17 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
         syncCheckDTO.setSyncStatus(syncTask.getStatusFlag());
 
         PreDealLogInfoDTO dealLogInfoDTO = preDealService.getLastPreDataByTaskId(taskId);
+        if (dealLogInfoDTO == null) {
+            RedisUtil.delCache(sKey);
+            return syncCheckDTO;
+        }
         //30分钟内没执行就重试 并在一天内
         Date date = DateUtils.addMinutes(new Date(), -30);
         Date dayDate = DateUtils.addDays(new Date(), -1);
-        if (dealLogInfoDTO.getUpdateTime().before(date)
+
+        if (dealLogInfoDTO != null && dealLogInfoDTO.getUpdateTime() != null
+                && dealLogInfoDTO.getCreateTime() != null
+                && dealLogInfoDTO.getUpdateTime().before(date)
                 && syncTask.getUpdateTime().before(date)
                 && syncTask.getCreateTime().after(dayDate)) {
             logger.info("重试：{}", taskId);