From abd83265117d443e37fd0404d2175e54fcb8722a Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Sat, 27 Oct 2018 17:16:16 +0800
Subject: [PATCH] - avoid nil TaskError

---
 business/jxutils/tasksch/parallel_task.go        | 4 +++-
 business/jxutils/tasksch/sequence_task.go        | 4 +++-
 business/partner/purchase/ebai/store_sku.go      | 2 +-
 business/partner/purchase/ebai/store_sku_test.go | 5 ++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/business/jxutils/tasksch/parallel_task.go b/business/jxutils/tasksch/parallel_task.go
index a436bad3f..cc75f21d0 100644
--- a/business/jxutils/tasksch/parallel_task.go
+++ b/business/jxutils/tasksch/parallel_task.go
@@ -175,7 +175,9 @@ func (task *ParallelTask) Run() {
 				task.Status = TaskStatusFinished
 			}
 		}
-		task.Err = NewTaskError(taskErr)
+		if taskErr != nil {
+			task.Err = NewTaskError(taskErr)
+		}
 		task.Result = taskResult
 		task.TerminatedAt = time.Now()
 		task.locker.Unlock()
diff --git a/business/jxutils/tasksch/sequence_task.go b/business/jxutils/tasksch/sequence_task.go
index 36ebf69d0..46ab279c6 100644
--- a/business/jxutils/tasksch/sequence_task.go
+++ b/business/jxutils/tasksch/sequence_task.go
@@ -64,7 +64,9 @@ func (task *SeqTask) Run() {
 				task.Status = TaskStatusFinished
 			}
 		}
-		task.Err = NewTaskError(taskErr)
+		if taskErr != nil {
+			task.Err = NewTaskError(taskErr)
+		}
 		task.Result = taskResult
 		task.TerminatedAt = time.Now()
 		task.locker.Unlock()
diff --git a/business/partner/purchase/ebai/store_sku.go b/business/partner/purchase/ebai/store_sku.go
index 69d11db84..3a3454fc8 100644
--- a/business/partner/purchase/ebai/store_sku.go
+++ b/business/partner/purchase/ebai/store_sku.go
@@ -191,8 +191,8 @@ func (p *PurchaseHandler) ReadStoreSku(storeID, skuID int) (skuNameExt *model.Sk
 
 func (p *PurchaseHandler) GetAllRemoteSkus(storeID int) (skus []map[string]interface{}, err error) {
 	page1, err := api.EbaiAPI.SkuList(utils.Int2Str(storeID), utils.Params2Map("pagesize", MaxPageSize))
-	skus = append(skus, page1.List...)
 	if err == nil {
+		skus = append(skus, page1.List...)
 		if page1.Pages > 1 {
 			pages := make([]int, page1.Pages-1)
 			for i := 2; i <= page1.Pages; i++ {
diff --git a/business/partner/purchase/ebai/store_sku_test.go b/business/partner/purchase/ebai/store_sku_test.go
index ffedc7c2b..f7b80b4cc 100644
--- a/business/partner/purchase/ebai/store_sku_test.go
+++ b/business/partner/purchase/ebai/store_sku_test.go
@@ -4,7 +4,6 @@ import (
 	"testing"
 	"time"
 
-	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 )
@@ -37,11 +36,11 @@ func TestSyncOneStoreCategoriesFromLocal2Remote(t *testing.T) {
 }
 
 func TestGetAllRemoteSkus(t *testing.T) {
-	result, err := new(PurchaseHandler).GetAllRemoteSkus(9)
+	result, err := new(PurchaseHandler).GetAllRemoteSkus(testShopID)
 	if err != nil {
 		t.Fatal(err.Error())
 	} else {
-		t.Log(utils.Format4Output(result, false))
+		t.Log(len(result))
 	}
 }