From e8be74752763d2b9eb306e1c637c955f03b26966 Mon Sep 17 00:00:00 2001
From: admin <admin@CHENQINGFENG>
Date: Sun, 2 Apr 2023 08:28:36 +0800
Subject: [PATCH] =?UTF-8?q?dlAllOrder=20null=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/service/sync/HeartService.java   | 37 ++++++++++++-------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java
index 684900bd6..8d65214e9 100644
--- a/src/main/java/com/glxp/api/service/sync/HeartService.java
+++ b/src/main/java/com/glxp/api/service/sync/HeartService.java
@@ -1,14 +1,33 @@
 package com.glxp.api.service.sync;
 
-import cn.hutool.core.collection.CollUtil;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.apache.ibatis.session.ExecutorType;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.ibatis.session.TransactionIsolationLevel;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.BasicProcessStatus;
 import com.glxp.api.constant.ConstantStatus;
-import com.glxp.api.dao.inout.*;
-import com.glxp.api.entity.inout.*;
+import com.glxp.api.dao.inout.IoCodeTempDao;
+import com.glxp.api.dao.inout.IoOrderDao;
+import com.glxp.api.dao.inout.IoOrderDetailBizDao;
+import com.glxp.api.dao.inout.IoOrderDetailCodeDao;
+import com.glxp.api.entity.inout.IoCodeEntity;
+import com.glxp.api.entity.inout.IoCodeTempEntity;
+import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
+import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
+import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.entity.sync.BasicDownloadStatusEntity;
 import com.glxp.api.entity.sync.BasicExportStatusEntity;
 import com.glxp.api.entity.sync.BasicExportStatusTimeEntity;
@@ -19,16 +38,8 @@ import com.glxp.api.res.sync.SpsSyncOrderResponse;
 import com.glxp.api.service.inout.IoOrderService;
 import com.glxp.api.util.CustomUtil;
 import com.glxp.api.util.DateUtil;
-import org.apache.ibatis.session.ExecutorType;
-import org.apache.ibatis.session.SqlSession;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.apache.ibatis.session.TransactionIsolationLevel;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
+import cn.hutool.core.collection.CollUtil;
 
 @Service
 public class HeartService {
@@ -166,7 +177,7 @@ public class HeartService {
 
     public void dlAllOrder() {
         BaseResponse<List<BasicExportStatusEntity>> baseResponse = spGetHttp.getBasicStatus(BasicProcessStatus.NEW_ALL_ORDER + "");
-        List<BasicExportStatusEntity> pageSimpleResponse = baseResponse.getData();
+        List<BasicExportStatusEntity> pageSimpleResponse = baseResponse !=null ? baseResponse.getData() : new ArrayList<>();
         if (pageSimpleResponse != null) {
             List<BasicExportStatusEntity> basicExportStatusEntities = pageSimpleResponse;
             if (basicExportStatusEntities != null && basicExportStatusEntities.size() > 0) {