Merge branch 'master' of e.coding.net:rosydev/baseapi

platformapi/tiktok_shop/tiktok_api/transport.go

@@ -16,12 +16,12 @@ import (
 )
 
 // /superm/getDispatcherInfo 运力呼叫询价/运力取消询价(正向)
-func (a *API) GetDispatcherInfo(storeID, shopOrderID int64, dispatcherType int32) (int64, error) {
+func (a *API) GetDispatcherInfo(storeID int64, shopOrderID string, dispatcherFeeType int32) (int64, error) {
 	request := superm_getDispatcherInfo_request.New()
 	request.Param = &superm_getDispatcherInfo_request.SupermGetDispatcherInfoParam{
-		StoreID:        storeID,
-		ShopOrderID:    shopOrderID,
-		DispatcherType: dispatcherType,
+		StoreID:           storeID,
+		ShopOrderID:       shopOrderID,
+		DispatcherFeeType: dispatcherFeeType,
 	}
 	response, err := request.Execute(a.accessTokenObj)
 	globals.SugarLogger.Debugf("运力呼叫询价/运力取消询价(正向)=========:%s", request.GetUrlPath())
@@ -36,8 +36,8 @@ func (a *API) GetDispatcherInfo(storeID, shopOrderID int64, dispatcherType int32
 	return response.Data.DispatcherFee, nil
 }
 
-// /superm/orderDispatcher 呼叫运力并发货/重新发货、取消运力
-func (a *API) OrderDispatcher(storeID, shopOrderID int64, dispatcherType int32) error {
+// /superm/shopOrderDispatcher 呼叫运力并发货/重新发货、取消运力
+func (a *API) ShopOrderDispatcher(storeID int64, shopOrderID string, dispatcherType int32) error {
 	request := superm_orderDispatcher_request.New()
 	request.Param = &superm_orderDispatcher_request.SupermOrderDispatcherParam{
 		StoreID:        storeID,

platformapi/tiktok_shop/tiktok_api/transport_test.go

@@ -7,7 +7,7 @@ import (
 
 //运力呼叫询价（正向）
 func TestGetDispatcherInfo(t *testing.T) {
-	dispatcherFee, err := a.GetDispatcherInfo(5015175317880528282, 5015175317880528282, 1)
+	dispatcherFee, err := a.GetDispatcherInfo(62490423, "5016270839501385439", 1)
 	fmt.Println(dispatcherFee)
 	fmt.Println(err)
 }