From 36d38162dc8223ce17c9bb17af23ccc0821bd98c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 4 Dec 2024 09:15:27 +0800 Subject: [PATCH] 1 --- platformapi/ebaiapi/callback.go | 5 +++++ platformapi/ebaiapi/ebaiapi_test.go | 4 ++-- platformapi/ebaiapi/shop_sku_test.go | 2 +- platformapi/fnpsapi/store.go | 8 ++++---- platformapi/mtwmapi/order_test.go | 2 +- platformapi/tiktok_shop/tiktok_api/afs_test.go | 2 +- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/platformapi/ebaiapi/callback.go b/platformapi/ebaiapi/callback.go index 029e1bfc..32f6b83e 100644 --- a/platformapi/ebaiapi/callback.go +++ b/platformapi/ebaiapi/callback.go @@ -110,6 +110,11 @@ type CBUserCancelInfo struct { Pictures []string `json:"pictures"` Type int `json:"type"` CancelType int `json:"cancel_type"` + ReasonCodeDesc string `json:"reason_code_desc"` + PlatformShopId int `json:"platform_shop_id"` + ReasonCode int `json:"reason_code"` + RefundOrderId string `json:"refund_order_id"` + IsReturnGoods string `json:"is_return_goods"` } //temp IM 用户/骑手消息通知 diff --git a/platformapi/ebaiapi/ebaiapi_test.go b/platformapi/ebaiapi/ebaiapi_test.go index ce86377b..467decd2 100644 --- a/platformapi/ebaiapi/ebaiapi_test.go +++ b/platformapi/ebaiapi/ebaiapi_test.go @@ -29,13 +29,13 @@ func init() { // api = New("62289", "d3ec2358d6a819ea") // 京西菜市 - //api = New("34665", "c3db75b754ea2d89") + api = New("34665", "c3db75b754ea2d89") //菜市测试 // api = New("62923", "aa4cdc6c1108486b") // 京西果园 - api = New("35957", "10013fbb7c2ddad7") + //api = New("35957", "10013fbb7c2ddad7") // api.SetCookie("PASSPORT_DELIMONT_TOKEN", "PBE_2.0_5cd1c6141c127d4188f026ac01fc93656266683e8dfb3127c2fdf894259e9034125ff3bdd2a997a385802ee3ef1802ba93a04acea34fde2d2b6e802c5dcd4ec6e3f4ad909a1d806e3ceeb349ed726b03d60ed1fe7010d4140aa338d9c5f05e3fec172c78d3d7f0ca579d61b7015af1bf99aa46b04d2b8a64aa50646dc09afe94b6b60e0ba9a933635db5e8b2a035e9b6d693b289acf1b256d5b9a3f8478c87b0b009115bfd1394f20bb5a0dc2c07b8d013a25f286ec6bf7f2d86010d65507e31358834b7a6b58fbd88cb3f1a12cf71c997b91c1527f6f3c10693f7c2bd6073da8633a98cd2dc1114dfa5be5ee0e60b02cf7e4a94d0fb563a8c01717e7c050f02249117219c07a2eb211577c208ba77f4d536fa25139bc249be93b38d6fc495ef67a32aa206835d177db402bc534de1d29caf4f6b4fbcd912c13f167d00d1732222744c336a5189728f72fb5e153c4b1164171cfb0c811f34f4c2fedd43f721b8706b43f8d631251c") //api.SetCookie("WMUSS", "NTE2NDMTAwMDAyNzYxNzAwOTEyTmUzNWJNcDlQ ") //api.SetCookie("WMSTOKEN", "NTE2NDMTAwMDAyNzYxNzAwOTEyTmUzNWJNcDlQ ") diff --git a/platformapi/ebaiapi/shop_sku_test.go b/platformapi/ebaiapi/shop_sku_test.go index 65fa3eb2..8327befe 100644 --- a/platformapi/ebaiapi/shop_sku_test.go +++ b/platformapi/ebaiapi/shop_sku_test.go @@ -26,7 +26,7 @@ func TestShopCategoryGet(t *testing.T) { } func TestShopGet222(t *testing.T) { - data, err := api.ShopGet("", 1255670921) + data, err := api.ShopGet("", 1257061574) fmt.Println(data) fmt.Println(err) } diff --git a/platformapi/fnpsapi/store.go b/platformapi/fnpsapi/store.go index 0694df9f..bbe3687a 100644 --- a/platformapi/fnpsapi/store.go +++ b/platformapi/fnpsapi/store.go @@ -182,13 +182,13 @@ func HttpToPetFN(param map[string]interface{}, requestType string) (*http.Respon url := "" switch requestType { case FengNiaoCallbackTypeStore: - url = "http://callback-jxpet.jxc4.com/fn/fnStore" + url = "http://callback-gblm.jxc4.com/fn/fnStore" case FengNiaoCallbackTypeOrder: - url = "http://callback-jxpet.jxc4.com/fn/fnOrder" + url = "http://callback-gblm.jxc4.com/fn/fnOrder" case FengNiaoCallbackTypeAbnormal: - url = "http://callback-jxpet.jxc4.com/fn/fnAbnormal" + url = "http://callback-gblm.jxc4.com/fn/fnAbnormal" case FengNiaoCallbackTypeToken: - url = "http://callback-jxpet.jxc4.com/fn/fnToken" + url = "http://callback-gblm.jxc4.com/fn/fnToken" } httpReq, err := http.NewRequest(http.MethodPost, url, body) if err != nil { diff --git a/platformapi/mtwmapi/order_test.go b/platformapi/mtwmapi/order_test.go index 0ebe81dd..6f2304dc 100644 --- a/platformapi/mtwmapi/order_test.go +++ b/platformapi/mtwmapi/order_test.go @@ -31,7 +31,7 @@ func getTimeFromTimestamp(timeStamp int64) time.Time { } func TestOrderGetOrderDetail(t *testing.T) { - result, err := api.OrderGetOrderDetail(3201343422470567673, false) + result, err := api.OrderGetOrderDetail(4001358520287936986, false) if err != nil { t.Fatal(err) } diff --git a/platformapi/tiktok_shop/tiktok_api/afs_test.go b/platformapi/tiktok_shop/tiktok_api/afs_test.go index a18fbf35..f38291ad 100644 --- a/platformapi/tiktok_shop/tiktok_api/afs_test.go +++ b/platformapi/tiktok_shop/tiktok_api/afs_test.go @@ -8,7 +8,7 @@ import ( ) // 京西速食(蔬菜) -var token1 = `{"access_token":"5f597642-4bd2-4083-beea-18ed631d9ad9","expires_in":1727788890,"scope":"SCOPE","shop_id":57939570,"shop_name":"京西菜市","refresh_token":"1b755265-1821-44b2-a355-20e78f76f981","authority_id":""}` +var token1 = `{"access_token":"97a511yhugi-1j7t4nq1hehos0000sn6spy","expires_in":1732606054,"scope":"SCOPE","shop_id":57939570,"shop_name":"京西菜市","refresh_token":"zuxb12yhugi-1j7t4nq1hehos0000sn6spy","authority_id":""}` // 美好菜市 //var token1 = `{"access_token":"9a315a03-c737-4a82-ae52-c9a6ce827007","expires_in":1699490747,"scope":"SCOPE","shop_id":68032645,"shop_name":"美好菜市","refresh_token":"8334c006-5301-4d25-911b-4d8cc7b70ebb","authority_id":""}`