From 609b2bcc976d005fa3a73a179ee3bea9e5274ee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 27 Oct 2023 18:20:01 +0800 Subject: [PATCH 1/3] 1 --- platformapi/baidunavi/baidunavi_model.go | 64 +++++++++++------------- 1 file changed, 30 insertions(+), 34 deletions(-) diff --git a/platformapi/baidunavi/baidunavi_model.go b/platformapi/baidunavi/baidunavi_model.go index 5df28e53..713190d7 100644 --- a/platformapi/baidunavi/baidunavi_model.go +++ b/platformapi/baidunavi/baidunavi_model.go @@ -36,38 +36,34 @@ package baidunavi //} type RiderPath struct { - Status int `json:"status"` - Message string `json:"message"` - Result struct { - Origin struct { - Lng float64 `json:"lng"` - Lat float64 `json:"lat"` - } `json:"origin"` - Destination struct { - Lng float64 `json:"lng"` - Lat float64 `json:"lat"` - } `json:"destination"` - Routes []struct { - Distance int `json:"distance"` - Duration int `json:"duration"` - Steps []struct { - Distance int `json:"distance"` - Duration int `json:"duration"` - Direction int `json:"direction"` - TurnType string `json:"turn_type"` - Name string `json:"name"` - Instruction string `json:"instruction"` - RestrictionsInfo string `json:"restrictions_info"` - Path string `json:"path"` - StartLocation struct { - Lng string `json:"lng"` - Lat string `json:"lat"` - } `json:"start_location"` - EndLocation struct { - Lng string `json:"lng"` - Lat string `json:"lat"` - } `json:"end_location"` - } `json:"steps"` - } `json:"routes"` - } `json:"result"` + Destination struct { + Lat float64 `json:"lat"` + Lng float64 `json:"lng"` + } `json:"destination"` + Origin struct { + Lat float64 `json:"lat"` + Lng float64 `json:"lng"` + } `json:"origin"` + Routes []struct { + Distance int `json:"distance"` + Duration int `json:"duration"` + Steps []struct { + Direction int `json:"direction"` + Distance int `json:"distance"` + Duration int `json:"duration"` + EndLocation struct { + Lat string `json:"lat"` + Lng string `json:"lng"` + } `json:"end_location"` + Instruction string `json:"instruction"` + Name string `json:"name"` + Path string `json:"path"` + RestrictionsInfo string `json:"restrictions_info"` + StartLocation struct { + Lat string `json:"lat"` + Lng string `json:"lng"` + } `json:"start_location"` + TurnType string `json:"turn_type"` + } `json:"steps"` + } `json:"routes"` } From fb2c8328bb2750b6a89cd206361413f72b7f99ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 1 Nov 2023 11:11:27 +0800 Subject: [PATCH 2/3] 1 --- platformapi/ebaiapi/shop_sku.go | 3 +++ platformapi/tiktok_shop/tiktok_api/afs_test.go | 6 +++--- platformapi/tiktok_shop/tiktok_api/transport_test.go | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/platformapi/ebaiapi/shop_sku.go b/platformapi/ebaiapi/shop_sku.go index 3d058db2..dfdf070a 100644 --- a/platformapi/ebaiapi/shop_sku.go +++ b/platformapi/ebaiapi/shop_sku.go @@ -2,6 +2,7 @@ package ebaiapi import ( "fmt" + "git.rosy.net.cn/jx-callback/globals" "regexp" "strings" @@ -311,6 +312,8 @@ func (a *API) SkuCreate(trackInfo, shopID string, customSkuID int64, params map[ }*/ params = utils.MergeMaps(params, defParams) result, err := a.AccessAPI2("sku.create", params, trackInfo) + globals.SugarLogger.Debugf("========result := %s", utils.Format4Output(result, false)) + globals.SugarLogger.Debugf("========result := %v", err) if err == nil && result.Data != nil { return utils.Interface2Int64WithDefault(result.Data.(map[string]interface{})[KeySkuID], 0), nil } diff --git a/platformapi/tiktok_shop/tiktok_api/afs_test.go b/platformapi/tiktok_shop/tiktok_api/afs_test.go index 2524dfa3..fcec715f 100644 --- a/platformapi/tiktok_shop/tiktok_api/afs_test.go +++ b/platformapi/tiktok_shop/tiktok_api/afs_test.go @@ -8,11 +8,11 @@ import ( ) // 京西速食(蔬菜) -var token1 = `{"access_token":"b27e1e5a-0e07-4311-b98b-69df26bbd82e","expires_in":1698285505,"scope":"SCOPE","shop_id":57939570,"shop_name":"京西菜市速食","refresh_token":"f6822620-4154-4a4a-b04e-7db30c08e7f9","authority_id":""}` +var token1 = `{"access_token":"5ffb6ad8-3f74-4711-b0d7-7b3dad8e4bca","expires_in":1698887957,"scope":"SCOPE","shop_id":57939570,"shop_name":"京西菜市速食","refresh_token":"62ca247b-519d-4b8b-bd1e-54b63208dc55","authority_id":""}` // 京西到家(商超) -var token2 = `{"access_token":"7e3853fa-24d4-4649-938b-46947da04c92","expires_in":1698887957,"scope":"SCOPE","shop_id":68023619,"shop_name":"京西到家","refresh_token":"1dd634e9-9f9e-459b-a770-341fb64e4f88","authority_id":""}` -var a = New("7267745202649957900", "51998fcf-d521-4553-8c0c-fa662c8dbd6e", token2) +//var token2 = `{"access_token":"7e3853fa-24d4-4649-938b-46947da04c92","expires_in":1698887957,"scope":"SCOPE","shop_id":68023619,"shop_name":"京西到家","refresh_token":"1dd634e9-9f9e-459b-a770-341fb64e4f88","authority_id":""}` +var a = New("7267745202649957900", "51998fcf-d521-4553-8c0c-fa662c8dbd6e", token1) // 查询售后单详情 func TestAfsOrder(t *testing.T) { diff --git a/platformapi/tiktok_shop/tiktok_api/transport_test.go b/platformapi/tiktok_shop/tiktok_api/transport_test.go index bfdb07bc..e12105c7 100644 --- a/platformapi/tiktok_shop/tiktok_api/transport_test.go +++ b/platformapi/tiktok_shop/tiktok_api/transport_test.go @@ -15,7 +15,7 @@ func TestGetDispatcherInfo(t *testing.T) { fmt.Println(err) } func TestCancelWaybill(t *testing.T) { - err := a.ShopOrderDispatcher(75324142, "6922809843002512994", 2) + err := a.ShopOrderDispatcher(64251630, "6923172525153719861", DispatcherFeeTypeCall) fmt.Println(err) } From d286588598de2ef710e2289b7f1edccdf9e80b0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 1 Nov 2023 14:42:31 +0800 Subject: [PATCH 3/3] 1 --- platformapi/ebaiapi/sku_test.go | 2 +- platformapi/jdapi/store_page_test.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/platformapi/ebaiapi/sku_test.go b/platformapi/ebaiapi/sku_test.go index 3fcaa987..90ba292e 100644 --- a/platformapi/ebaiapi/sku_test.go +++ b/platformapi/ebaiapi/sku_test.go @@ -24,7 +24,7 @@ func TestSkuBrandList(t *testing.T) { } func TestPictureUpload(t *testing.T) { - result, err := api.PictureUpload("http://image.jxc4.com/image/e078b225d7b232b4497a689dbf65159e.jpg", nil) + result, err := api.PictureUpload("http://image.jxc4.com/f0406c28c014a69a1150730c6b4b569b.jpg", nil) if err != nil { t.Fatal(err) } else { diff --git a/platformapi/jdapi/store_page_test.go b/platformapi/jdapi/store_page_test.go index 632d388d..ec4890df 100644 --- a/platformapi/jdapi/store_page_test.go +++ b/platformapi/jdapi/store_page_test.go @@ -234,7 +234,6 @@ func TestGetJdUpcCodeByUpc(t *testing.T) { } } - fmt.Println("==============================================================") for _, v := range data { fmt.Println(v) }