From 3710a1a6a3a7a06e49d4b4200b92614bd65c2189 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 20 Feb 2020 10:36:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=A5=BF=E9=B2=9C=E8=BE=BE?=
 =?UTF-8?q?=E5=95=86=E5=93=81=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      | 11 +++++++----
 platformapi/ebaiapi/store_page_test.go |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/platformapi/ebaiapi/store_page.go b/platformapi/ebaiapi/store_page.go
index b52fcacb..e33cfc2a 100644
--- a/platformapi/ebaiapi/store_page.go
+++ b/platformapi/ebaiapi/store_page.go
@@ -1026,7 +1026,7 @@ func (a *API) GetStoresShowWindowSkus(baiduShopID int64) (storeShowWindowList []
 }
 
 //获取饿鲜达商品库
-func (a *API) GetExianDaSkuDepot() (results []*ExianDaSkus, err error) {
+func (a *API) GetExianDaSkuDepot(upcID string) (results []*ExianDaSkus, err error) {
 	var (
 		pageNum  = 1
 		pageSize = 200
@@ -1041,6 +1041,9 @@ func (a *API) GetExianDaSkuDepot() (results []*ExianDaSkus, err error) {
 				},
 			},
 		}
+		if upcID != "" {
+			params["params"].(map[string]interface{})["goodsListQry"].(map[string]interface{})["upcId"] = upcID
+		}
 		result, err := a.AccessStorePage("bwm_newretail.scm_ic/GoodsServiceI/findGoodsList", "https://ncp.ele.me", params, true)
 		if err != nil {
 			return results, err
@@ -1048,12 +1051,12 @@ func (a *API) GetExianDaSkuDepot() (results []*ExianDaSkus, err error) {
 		if result["data"] != nil {
 			var exianDaSkus []*ExianDaSkus
 			utils.Map2StructByJson(result["data"], &exianDaSkus, false)
-			if len(exianDaSkus) < pageSize {
-				break
-			}
 			if len(exianDaSkus) > 0 {
 				results = append(results, exianDaSkus...)
 			}
+			if len(exianDaSkus) < pageSize {
+				break
+			}
 		}
 		pageNum++
 	}
diff --git a/platformapi/ebaiapi/store_page_test.go b/platformapi/ebaiapi/store_page_test.go
index 36c7d90f..dfe4bd2f 100644
--- a/platformapi/ebaiapi/store_page_test.go
+++ b/platformapi/ebaiapi/store_page_test.go
@@ -153,7 +153,7 @@ func TestGetStoresShowWindowSkus(t *testing.T) {
 }
 
 func TestGetExianDaSkuDepot(t *testing.T) {
-	result, err := api.GetExianDaSkuDepot()
+	result, err := api.GetExianDaSkuDepot("190600741")
 	if err != nil {
 		t.Fatal(err)
 	}