From 3f1ba7ec545219eadb1f95839b5261f5cdec9681 Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 9 Jul 2019 21:43:40 +0800 Subject: [PATCH] - up --- platformapi/ebaiapi/activity_page.go | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/platformapi/ebaiapi/activity_page.go b/platformapi/ebaiapi/activity_page.go index 03b14671..48f5f3cc 100644 --- a/platformapi/ebaiapi/activity_page.go +++ b/platformapi/ebaiapi/activity_page.go @@ -92,18 +92,20 @@ func (a *API) BegetActivityList(supplierID int64, showStatus, activityType int) "perpage": pageSize, "supplier_id": supplierID, "show_status": showStatus, - "activity_type": activityType, + "activity_type": activityType, //不设置这个值，缺省为：PageActivityTypeSkuDirectDown } for { params["curpage"] = pageNo retVal, err2 := a.AccessStorePage("commodity/activity/begetactivitylist", params, false) if err = err2; err == nil { var listInfo *PageActListInfo - if err = utils.Map2StructByJson(retVal, &listInfo, false); err != nil { + if err = utils.Map2StructByJson(retVal, &listInfo, true); err != nil { return nil, err } - actList = append(actList, listInfo.ActivityList...) - if len(actList) >= listInfo.Total { + if listInfo != nil { + actList = append(actList, listInfo.ActivityList...) + } + if listInfo == nil || len(actList) >= listInfo.Total { return actList, nil } pageNo++ @@ -127,11 +129,13 @@ func (a *API) BegetActSkuList(activityID, supplierID int64) (actSkuList []*PageA retVal, err2 := a.AccessStorePage("commodity/activity/begetactskulist", params, false) if err = err2; err == nil { var pageActivityInfo *PageActivityInfo - if err = utils.Map2StructByJson(retVal, &pageActivityInfo, false); err != nil { + if err = utils.Map2StructByJson(retVal, &pageActivityInfo, true); err != nil { return nil, err } - actSkuList = append(actSkuList, pageActivityInfo.List...) - if len(actSkuList) >= pageActivityInfo.Total { + if pageActivityInfo != nil { + actSkuList = append(actSkuList, pageActivityInfo.List...) + } + if pageActivityInfo == nil || len(actSkuList) >= pageActivityInfo.Total { return actSkuList, nil } pageNo++