From 76e909149452702d5a06c70dafabf05a34053f7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 14 Feb 2020 09:22:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A5=BF=E9=B2=9C=E8=BE=BE=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=BA=93=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platformapi/ebaiapi/store_page.go      | 32 ++++++++++++++------------
 platformapi/ebaiapi/store_page_test.go |  5 +++-
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/platformapi/ebaiapi/store_page.go b/platformapi/ebaiapi/store_page.go
index a9eefa6b..b51699b9 100644
--- a/platformapi/ebaiapi/store_page.go
+++ b/platformapi/ebaiapi/store_page.go
@@ -908,27 +908,29 @@ func (a *API) GetExianDaSkuDepot() (results []*ExianDaSkus, err error) {
 		pageNum  = 1
 		pageSize = 200
 	)
-	params := map[string]interface{}{
-		"metas": map[string]interface{}{},
-		"params": map[string]interface{}{
-			"goodsListQry": map[string]interface{}{
-				"pageNum":  pageNum,
-				"pageSize": pageSize,
-			},
-		},
-	}
 	for {
+		params := map[string]interface{}{
+			"metas": map[string]interface{}{},
+			"params": map[string]interface{}{
+				"goodsListQry": map[string]interface{}{
+					"pageNum":  pageNum,
+					"pageSize": pageSize,
+				},
+			},
+		}
 		result, err := a.AccessStorePage("bwm_newretail.scm_ic/GoodsServiceI/findGoodsList", "https://ncp.ele.me", params, true)
 		if err != nil {
-			continue
+			return results, err
 		}
-		if len(result) < pageSize {
-			break
-		}
-		if len(result) > 0 {
+		if result["data"] != nil {
 			var exianDaSkus []*ExianDaSkus
 			utils.Map2StructByJson(result["data"], &exianDaSkus, false)
-			results = append(results, exianDaSkus...)
+			if len(exianDaSkus) < pageSize {
+				break
+			}
+			if len(exianDaSkus) > 0 {
+				results = append(results, exianDaSkus...)
+			}
 		}
 		pageNum++
 	}
diff --git a/platformapi/ebaiapi/store_page_test.go b/platformapi/ebaiapi/store_page_test.go
index fe87ad2a..429dc9d0 100644
--- a/platformapi/ebaiapi/store_page_test.go
+++ b/platformapi/ebaiapi/store_page_test.go
@@ -153,7 +153,10 @@ func TestGetStoresShowWindowSkus(t *testing.T) {
 }
 
 func TestGetExianDaSkuDepot(t *testing.T) {
-	result, _ := api.GetExianDaSkuDepot()
+	result, err := api.GetExianDaSkuDepot()
+	if err != nil {
+		t.Fatal(err)
+	}
 	t.Log(utils.Format4Output(result, false))
 }