diff --git a/platformapi/dadaapi/order_test.go b/platformapi/dadaapi/order_test.go index 8c9bc2d8..7f500d4d 100644 --- a/platformapi/dadaapi/order_test.go +++ b/platformapi/dadaapi/order_test.go @@ -9,34 +9,36 @@ import ( ) func TestAddOrderAfterQuery(t *testing.T) { - orderID := utils.GetUUID() + // orderID := utils.GetUUID() result, err := dadaapi.QueryDeliverFee(&OperateOrderParams{ - ShopNo: testShopNo, - OriginID: orderID, - CityCode: "028", + ShopNo: "102908", + OriginID: "130652775117000002", + CityCode: "021", CargoPrice: 0.01, IsPrepay: 0, ReceiverName: "某人", ReceiverAddress: "西南交通大学科技大厦", - ReceiverLng: 104.056822, - ReceiverLat: 30.696041, + ReceiverLng: 121.258651, + ReceiverLat: 31.034611, ReceiverPhone: "18180948107", + CargoType: 19, + CargoWeight: 3, }) if err != nil { t.Fatal(err) } baseapi.SugarLogger.Debug(utils.Format4Output(result, false)) - err = dadaapi.AddOrderAfterQuery(result.DeliveryNo) - if err != nil { - t.Fatal(err) - } + // err = dadaapi.AddOrderAfterQuery(result.DeliveryNo) + // if err != nil { + // t.Fatal(err) + // } - cancelResponse, err := dadaapi.CancelOrder(orderID, ReasonIDOther, "test") - if err != nil { - t.Fatal(err) - } - baseapi.SugarLogger.Debug(utils.Format4Output(cancelResponse, false)) + // cancelResponse, err := dadaapi.CancelOrder(orderID, ReasonIDOther, "test") + // if err != nil { + // t.Fatal(err) + // } + // baseapi.SugarLogger.Debug(utils.Format4Output(cancelResponse, false)) } func TestCancel(t *testing.T) { diff --git a/platformapi/ebaiapi/activity_page.go b/platformapi/ebaiapi/activity_page.go index 9fbfb851..24211694 100644 --- a/platformapi/ebaiapi/activity_page.go +++ b/platformapi/ebaiapi/activity_page.go @@ -86,38 +86,38 @@ type PageActivityInfo struct { } func (a *API) BegetActivityList(showStatus, activityType int, baiduShopID, supplierID int64) (actList []*PageActItem, err error) { - pageSize := 20 - pageNo := 1 - params := map[string]interface{}{ - "perpage": pageSize, - "show_status": showStatus, - "activity_type": activityType, //不设置这个值,缺省为:PageActivityTypeSkuDirectDown - } - if baiduShopID > 0 { - params["wid"] = baiduShopID - } - if supplierID > 0 { - params[KeySupplierID] = supplierID - } - 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, true); err != nil { - return nil, err - } - if listInfo != nil { - actList = append(actList, listInfo.ActivityList...) - } - if listInfo == nil || len(actList) >= listInfo.Total { - return actList, nil - } - pageNo++ - } else { - return nil, err - } - } + // pageSize := 20 + // pageNo := 1 + // params := map[string]interface{}{ + // "perpage": pageSize, + // "show_status": showStatus, + // "activity_type": activityType, //不设置这个值,缺省为:PageActivityTypeSkuDirectDown + // } + // if baiduShopID > 0 { + // params["wid"] = baiduShopID + // } + // if supplierID > 0 { + // params[KeySupplierID] = supplierID + // } + // 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, true); err != nil { + // return nil, err + // } + // if listInfo != nil { + // actList = append(actList, listInfo.ActivityList...) + // } + // if listInfo == nil || len(actList) >= listInfo.Total { + // return actList, nil + // } + // pageNo++ + // } else { + // return nil, err + // } + // } return nil, err }