This commit is contained in:
gazebo
2019-07-09 21:43:40 +08:00
parent 96733efa33
commit 3f1ba7ec54

View File

@@ -92,18 +92,20 @@ func (a *API) BegetActivityList(supplierID int64, showStatus, activityType int)
"perpage": pageSize, "perpage": pageSize,
"supplier_id": supplierID, "supplier_id": supplierID,
"show_status": showStatus, "show_status": showStatus,
"activity_type": activityType, "activity_type": activityType, //不设置这个值缺省为PageActivityTypeSkuDirectDown
} }
for { for {
params["curpage"] = pageNo params["curpage"] = pageNo
retVal, err2 := a.AccessStorePage("commodity/activity/begetactivitylist", params, false) retVal, err2 := a.AccessStorePage("commodity/activity/begetactivitylist", params, false)
if err = err2; err == nil { if err = err2; err == nil {
var listInfo *PageActListInfo var listInfo *PageActListInfo
if err = utils.Map2StructByJson(retVal, &listInfo, false); err != nil { if err = utils.Map2StructByJson(retVal, &listInfo, true); err != nil {
return nil, err return nil, err
} }
if listInfo != nil {
actList = append(actList, listInfo.ActivityList...) actList = append(actList, listInfo.ActivityList...)
if len(actList) >= listInfo.Total { }
if listInfo == nil || len(actList) >= listInfo.Total {
return actList, nil return actList, nil
} }
pageNo++ pageNo++
@@ -127,11 +129,13 @@ func (a *API) BegetActSkuList(activityID, supplierID int64) (actSkuList []*PageA
retVal, err2 := a.AccessStorePage("commodity/activity/begetactskulist", params, false) retVal, err2 := a.AccessStorePage("commodity/activity/begetactskulist", params, false)
if err = err2; err == nil { if err = err2; err == nil {
var pageActivityInfo *PageActivityInfo var pageActivityInfo *PageActivityInfo
if err = utils.Map2StructByJson(retVal, &pageActivityInfo, false); err != nil { if err = utils.Map2StructByJson(retVal, &pageActivityInfo, true); err != nil {
return nil, err return nil, err
} }
if pageActivityInfo != nil {
actSkuList = append(actSkuList, pageActivityInfo.List...) actSkuList = append(actSkuList, pageActivityInfo.List...)
if len(actSkuList) >= pageActivityInfo.Total { }
if pageActivityInfo == nil || len(actSkuList) >= pageActivityInfo.Total {
return actSkuList, nil return actSkuList, nil
} }
pageNo++ pageNo++