From f66222cd30a8cae91a3eae75d59838d6c44f2459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Tue, 9 Mar 2021 08:54:11 +0800 Subject: [PATCH] aa --- platformapi/ebaiapi/ebaiapi_test.go | 4 +- platformapi/ebaiapi/shop.go | 10 +++++ platformapi/ebaiapi/shop_test.go | 10 ++++- platformapi/jdapi/jdapi_test.go | 7 ++- platformapi/jdapi/store_page.go | 66 ++++++++++++++++++++++++++++ platformapi/jdapi/store_page_test.go | 36 +++++++++++++++ platformapi/jdapi/store_test.go | 5 +-- platformapi/mtwmapi/shipping_test.go | 2 +- 8 files changed, 129 insertions(+), 11 deletions(-) diff --git a/platformapi/ebaiapi/ebaiapi_test.go b/platformapi/ebaiapi/ebaiapi_test.go index bff5a2d7..71ca3195 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", "4AAPQCAAB5PF0aUGcBVzoRTCEkOFhFIhx-Yk9vN2EfPHYoLlROKBEsQmAUQjhNUgRt0ADAP5x-RFklwAAdjxGO11iOj8xKXYSSDIJb2BcPghsaklNfQwGS10JOVRFfhAiYElhEXFXIzoJKyloCGdwdFE6Qk9FRxojUFN3FVEHNjJPZJu4Bt9nxQ13cwoMbjA") api.SetCookie("WMSTOKEN", "AcAANQZAABbC04rUBZFc2UYanlocDAaP0dcfzZCeS1SHQ1qJ15ExgAA13A2dGLjdbcitBZJu4Bn6B_g6cZAAA0tyyFm8cdBaNAQAAwug8HTG0xRjwt1UZzbcAAN7ofRO") diff --git a/platformapi/ebaiapi/shop.go b/platformapi/ebaiapi/shop.go index c3bee887..fe3fa1e4 100644 --- a/platformapi/ebaiapi/shop.go +++ b/platformapi/ebaiapi/shop.go @@ -311,3 +311,13 @@ func (a *API) ShopAptitudeUpload(shopID string, baiduShopID int64, params map[st } return err } + +//查询自配送物流信息 +func (a *API) ShopDeliveryinfoGet(shopID string, baiduShopID int64) (err error) { + params := a.genShopIDParams(shopID, baiduShopID, 0) + _, err = a.AccessAPI("shop.deliveryinfo.get", params) + if err == nil { + return nil + } + return err +} diff --git a/platformapi/ebaiapi/shop_test.go b/platformapi/ebaiapi/shop_test.go index 420947e5..e5d1b6bb 100644 --- a/platformapi/ebaiapi/shop_test.go +++ b/platformapi/ebaiapi/shop_test.go @@ -53,7 +53,7 @@ func TestShopCreate(t *testing.T) { } func TestShopGet(t *testing.T) { - result, err := api.ShopGet("", 2267237821) //2233065879 ,22267134648 + result, err := api.ShopGet2("", 32267674055) //2233065879 ,22267134648 if err != nil { t.Fatal(err) } else { @@ -241,3 +241,11 @@ func TestShopAptitudeUpload(t *testing.T) { t.Fatal(err) } } + +func TestShopDeliveryinfoGet(t *testing.T) { + err := api.ShopDeliveryinfoGet("", 32267674055) + if err != nil { + t.Fatal(err) + } + // t.Log(utils.Format4Output(result, false)) +} diff --git a/platformapi/jdapi/jdapi_test.go b/platformapi/jdapi/jdapi_test.go index 9074d926..d979db61 100644 --- a/platformapi/jdapi/jdapi_test.go +++ b/platformapi/jdapi/jdapi_test.go @@ -30,12 +30,11 @@ func init() { //prod zs // api = New("6f8d3290-0120-4ad7-8b53-943c67c84f3f", "789279b9ae814ba091ac52815566b54d", "5d668cd227644637bb0fd73ed8118ec8") // const cookieValue = "YYJV3NHVBPHLD36FWP6F3EM5PTXJ2XZQS7U4HWRIDPP4IWGUKUIB4XG5N26CZRDLDF7PKOXBPD6BNTUAJLETLZOIWMCVFI3K6MYZIY4QBIXIMXYDJNUKFGJVQTN5356SAD6WPCIHWNQAG7DDMF7L7S3SHCT3RM3CQG7IJIPUQ3THS5UIUYWMKINM7ETUOQB7OBPOPZVCT3ZJY55243TDVXLO25PP4UYSPTTPMNQ7HPMWOJKJ3BJWGVHD243MXH7NZWW264TKN5UOCJBSSSOKD2QQII" - const cookieValue = "OPJQMA7B3FTKCAUGO7FHCH5NMBGAWGGXYRNLEHYYZNGNPNIBCAM4IOEPG3NT3RIA44G5C3535Q5LGG4F4SR4AZVLGYKYTKFJJKEAOXENVBL5VXNILRP3GLNVVWA26XZ3VGSYOHA72RICMVZS3G53DTEH3KKMSODEAJKHHXYAH3LVYHN7XCJDFDBTM7ELR5DAISLMYBDKZCAW7ME3IU6YX3SOLHZ7IXBXZ2XSFROMMSKNOYMLDABEV4JA57RIMIX22SNOBCLIFKREPFRN3RZVCFCVTSG7GXALZQUVXLWNYG35TDRA7JURR7VR3YVIP66T6G3SOARECZTEQ27GXNN5VHKRYKPJS72CSISRO5Y" - api.SetJdCookie(cookieValue) + // const cookieValue = "OPJQMA7B3FTKCAUGO7FHCH5NMBGAWGGXYRNLEHYYZNGNPNIBCAM4IOEPG3NT3RIA44G5C3535Q5LGG4F4SR4AZVLGYKYTKFJJKEAOXENVBL5VXNILRP3GLNVVWA26XZ3VGSYOHA72RICMVZS3G53DTEH3KKMSODEAJKHHXYAH3LVYHN7XCJDFDBTM7ELR5DAISLMYBDKZCAW7ME3IU6YX3SOLHZ7IXBXZ2XSFROMMSKNOYMLDABEV4JA57RIMIX22SNOBCLIFKREPFRN3RZVCFCVTSG7GXALZQUVXLWNYG35TDRA7JURR7VR3YVIP66T6G3SOARECZTEQ27GXNN5VHKRYKPJS72CSISRO5Y" + // api.SetJdCookie(cookieValue) // api.SetCookie("user", "VCQUVHVJI4ELNGFZOYMCDYDUSHEJMPXZRZXSNBRB4MVBNENP72REAAZR3R4SGDJ5ZI4FLYLLN5EGBBMTFCWHZVESIWBNLKZPLHWD6UIBTPXOF5IXM6AVA3V6TUNZD5UJS43AROJ2IRPZWEN5AGZYBUEGD3MSKKBKBSRP3DSEQXLITYNBLFZCHXCA7L4KGOSJRMM7R5IQP7QGLGRQB27AOE4YMLRJ3UPTZADPWJOYB3UZ7UZHLBVZRREEX647O3WQUU4BYXUOFZPIPRR77W3PQV543E") // api.SetCookieWithStr(` - // shshshfpa=13b38d4a-8ba0-df12-0012-82d9a37fb835-1573795914; shshshfpb=abYp8Dq5JobRtp2pkZa7MbA%3D%3D; cart_uuid=1bd562b37ef02371; track=46099cdb-39fb-abe6-579e-ea9536a8cf9c; deviceid_pdj_jd=H5_DEV_92DD6F05-B71A-43D7-9790-529335C43AAC; mba_muid=1605755815875269445822; TrackerID=E6aNCj4mNlBVkq6eyFfWLvkbWl9DhdG-pRGVaQPbvt2ewCa2n0QM-p0mViOLv_Uem9pAWgbNZEeaJuaz4gARAW9rTj8PJK-3hmcbl9N9h1qg-DMYXvdwc3Iau-AMlWin29CojqE8YnUPMtlJUf2gnA; pt_token=y2wjxzef; pwdt_id=jd_5e10f2d70fb4c; h5_coords_obj=""; o2o_m_h5_sid=5cb8b4db-feaa-4b25-aa96-df96cf9dba6d; PDJ_H5_JDPIN=jd_5e10f2d70fb4c; PDJ_H5_MOBILE=181****0913; PDJ_H5_PIN=JD_222ea79f49b3211; navigation=[%22shop_jxcs2020%22]; shshshfp=34eda22ad0af63b76392daccd2d03f2e; cid=NWtRMjE2NndZMzc4N2hWNzMyOHFBNDcwMXdTMjEwMm9BMjE4M3JPNjkwNHJQODk2; 3AB9D23F7A4B3C9B=AK36FFYF5J6WMPRH7YTXMEX4CATHR6NAA3IQEESU2I33FEJRQ3DRLU4SZJYD2XGFLCFW43DHYP5HQKOMR4EFQSLKLA; __jdu=1591327001141529223150; __jdv=27966078|direct|-|none|-|1606900892557; pt_key=app_openAAJfzzr6ADCQcdEYCKb4BH4DNh-9sVcgVB7nYveTS-J-x3tuin7otTCG7qTRTasxQdi-pr8mkFU; pt_pin=jd_5e10f2d70fb4c; sid=7fc3a18bc45c5766395cd2a8ad1c6daw; is_sz_old_version=false; language=zh_CN; TrackID=1a_Q7xLAd79K-ifyBFeTkWcSF5DEgCm9ISEjFoCF1VhbmI0XLzk-3Np5Wa0O0f0W2UZCX327iWisSzKkCasW_kqc4MqKSXDbOxk3w4AByhjM; pinId=qA40zQJfoxUJ0BznFrVelbV9-x-f3wj7; pin=jd_5e10f2d70fb4c; unick=jd_181600jgy; _tp=tPAwCz7dZ2wG9FcrXkvXEPcH%2FgU%2BK8r%2FxTPrJfx1wo8%3D; _pst=jd_5e10f2d70fb4c; __jda=191429163.1591327001141529223150.1591327001.1607907141.1607938587.81; _base_=YKH2KDFHMOZBLCUV7NSRBWQUJPBI7JIMU5R3EFJ5UDHJ5LCU7R2NILKK5UJ6GLA2RGYT464UKXAI5KK7PNC5B5UHJ2HVQ4ENFP57OC2NCIWTST4KDNCWZES6EV2TD5XDTCNE6YVKRXISVWNQHZDBO6QEKYXMXGPYGVEOCQCSG4SOQWCP5WPWO6EFS7HEHMRWVKBRVHB33TFD4AUHV3TOJD7MGBX53BNNP2E6MSSOORYGL5H2GYFRURR5ACFJ54GH7PTHFL22YL3C6ODFYFTWGV5UAWCX5C6J372TDCL6LDNEERERTGC3XZYHUWG3GYQCRBMGP7O2Q2MPVVQAQIWW3S2YBGSPJZVO3XPNMOJI6RFTJD5NXZUZMBDK4FVEVR2D - // `) + // lsp-store1.jddj.com=FFLJJGBAWKPSZM7MNBCXJ2PTYFVB6FMPUQYSINJLH5HINHNYC22O3IZPU2644VM3AF245ANGSYECBMCITLLRA6QZFCZY3455CLYLYJ3D5EFZ5623HGYBU5Q63KOLKGSK6HD6E3RXWS2SL7G2F4CPWB4W4KZATULABNVRXOZXXMGM2SFC7FJV53SUCWW5V6HZO2SBJL5ARX3RKLIEBWPKUX6G67ZV4WUL77J5SQRLBI7ETJN7WKM7KXTGZLDDVQK6JOU24WJL4PVF3PPYDNTOLLXDABUFAZSE6C6CNOMI6L2TAK43JJIJQRQAQUQSU537ZFLVPGBYFDJYY; o2o-pms1.jddj.com=FFLJJGBAWKPSZM7MNBCXJ2PTYFVB6FMPUQYSINJLH5HINHNYC22O3IZPU2644VM3AF245ANGSYECBMCITLLRA6QZFCZY3455CLYLYJ3D5EFZ5623HGYBU5Q63KOLKGSK6HD6E3RXWS2SL7G2F4CPWB4W4L6QADCODEQ7HPAGBSIFCQME56IJVNLQP576S22FJ2S6JICBWXDINE7MCIXTUTTBSTPXTH4ZCQQ26HEPMG6IKZMBVLP327PEE3OQRFBS3CT2IVMA3GEVFVZYDHM4R25SUY; josl-privilege1.jddj.com=FFLJJGBAWKPSZM7MNBCXJ2PTYFVB6FMPUQYSINJLH5HINHNYC22O3IZPU2644VM3AF245ANGSYECBMCITLLRA6QZFCZY3455CLYLYJ3D5EFZ5623HGYBU5Q63KOLKGSK6HD6E3RXWS2SL7G2F4CPWB4W4JFIVGVMNFIX4EJXL7JPIAY3KHKJVNLQP576S22FJ2S6JICBWXDIM7MUWUE74AUQTVCMMKQE4JG7Z6V3MJHBMCW7DVNX7IVZ2SO6XHKGFHBZ65VKNEBUUCNECJFH6DWBEJF2TLSZFPR6UXN57ANWNZNO4MAGQUDGITYLYJVZRDZPKMBLTNFFB5BCNIBJBWT3K6PVKOCSAJXJPUY; o2o-stock1.jddj.com=FFLJJGBAWKPSZM7MNBCXJ2PTYFVB6FMPUQYSINJLH5HINHNYC22O3IZPU2644VM3AF245ANGSYECBMCITLLRA6QZFCZY3455CLYLYJ3D5EFZ5623HGYBU5Q63KOLKGSK6HD6E3RXWS2SL7G2F4CPWB4W4JLXDMYTRAOI5OWDP5ODT42ZAK7ZVNLQP576S22FJ2S6JICBWXDINLIVVFV3NTWL42UL4YPQWX6AVREPMG6IKZMBVLP327PEE3OQRFBS3CT2IVMA3GEVFVZYDHM4R25SUY; store_deviceid=89a38e81dfbb776fa5f866f74ed437a3; store_session=%231615183107759; jdO2OOpenPortalSessionId=381A8AAF4B93511233C7D242D49DF305.s1; JSESSIONID=462D7A491FA248C2E6C89C2472FF46B8.s1`) } func TestTest(t *testing.T) { diff --git a/platformapi/jdapi/store_page.go b/platformapi/jdapi/store_page.go index 3c8ca643..03e46eee 100644 --- a/platformapi/jdapi/store_page.go +++ b/platformapi/jdapi/store_page.go @@ -26,6 +26,32 @@ const ( accessStorePageCookieName5 = "sta-store.jddj.com" ) +var ( + interfaceMap = map[string][]interface{}{ + "bcda6aa3af904158840520d746d97692": []interface{}{"message.djsw.orderAccounting", 0}, //订单应结消息 + "c716ba1e882a4334975d773eb2436eb4": []interface{}{"message.djsw.financeAdjustment", -2}, //财务调整单消息 + "0becae34d53345febfea238e3785d9fe": []interface{}{"message.djsw.pickFinishOrder", 0}, //拣货完成消息 + "e5501ab3bb2d4e6e82cd9affb27f1b12": []interface{}{"message.djsw.deliveryOrder", 0}, //订单开始配送消息 + "4acf6346a6b942629ce4b143160ecc0d": []interface{}{"message.djsw.finishOrder", 0}, //订单妥投消息 + "4fa7419b8c7440f887b4f4df5bee85fd": []interface{}{"message.djsw.lockOrder", 0}, //订单锁定消息 + "e95911589479472e8b6f4d099ad343b5": []interface{}{"message.djsw.userCancelOrder", 0}, //用户取消消息 + "f93ddfb7034b468da4d1ef10abe4b3ab": []interface{}{"message.djsw.newOrder", 0}, //创建新订单消息 + "29fa5e8542614661ac43410b9273dba6": []interface{}{"message.djsw.applyCancelOrder", 0}, // 用户申请取消消息 + "46f6414b799b416c92be9b890cc985ca": []interface{}{"message.djsw.orderAdjust", 0}, // 订单调整消息 + "fe2896ec5a394a66ab1bca084c29eb70": []interface{}{"message.djsw.pushDeliveryStatus", 0}, //订单运单状态消息 + "baa8f6128b1d4a46a8c969d3a3b2016f": []interface{}{"message.djsw.orderInfoChange", 0}, //订单信息变更消息 + "68d84d873729471db4d9c6d987dd8eb8": []interface{}{"message.djsw.orderWaitOutStore", 0}, //订单等待出库消息 + "bf3c0d18127b4c2982a806c415a7e0d5": []interface{}{"message.djsw.orderAddTips", 0}, //订单商家小费消息 + "7ce971a2a8c24437b4734f805f86bb34": []interface{}{"message.djsw.unlockOrder", 0}, // 订单解锁消息 + "2feddf4f8a17447791c4872b9134cdb5": []interface{}{"message.djsw.deliveryCarrierModify", 0}, //订单转自送消息 + "052798b978024574af96209e089168ed": []interface{}{"message.djsw.venderAuditApplyCancelOrder", 0}, //商家审核用户取消申请消息 + "1cbf43a35fcd4212809414e8c57d400a": []interface{}{"message.djsw.newAfterSaleBill", -3}, //创建售后单消息 + "6ebe1528c39b436b8cbf5a2a75d06d8b": []interface{}{"message.djsw.afterSaleBillStatus", 0}, //售后单状态消息 + "6b6906f334884aeb88ba7d3ffaa9c688": []interface{}{"message.djsw.newApplyAfterSaleBill", -3}, //创建售后单申请消息 + "1f6da863a76b43d3a44dbe737b733240": []interface{}{"message.djsw.updateApplyAfterSaleBill", -3}, //修改售后单申请消息 + } +) + type SkuPageImg struct { Big string `json:"big"` Share string `json:"share"` @@ -1118,3 +1144,43 @@ func (a *API) GetJdStoreInfo(vendorStoreID string) (retVal interface{}, err erro retVal, err = a.AccessStorePage2("http://www.jxc4.com/jd/client", jdParams, false, "") return retVal, err } + +//订阅京东接口 +func (a *API) UpdateInterStatus(interfaceId, interfaceCode string, interfaceType int) (err error) { + jdParams := map[string]interface{}{ + "interfaceId": interfaceId, + "interfaceCode": interfaceCode, + "isEnabled": 1, + "interfaceType": interfaceType, + } + _, err = a.AccessStorePage2("https://openo2o.jddj.com/sandBox/updateInterStatus.htm", jdParams, true, "") + return err +} + +//设置京东接口地址 +func (a *API) SaveMsgUrl(interfaceId, testUrl, formalUrl string, interfaceType int) (err error) { + jdParams := map[string]interface{}{ + "interfaceId": interfaceId, + "testUrl": testUrl, + "formalUrl": formalUrl, + "interfaceType": interfaceType, + } + _, err = a.AccessStorePage2("https://openo2o.jddj.com/sandBox/saveMsgUrl.htm", jdParams, true, "") + return err +} + +//发送测试消息 +func (a *API) ExcuteInvoking(interfaceId string, interfaceType int) (err error) { + jdParams := map[string]interface{}{ + "interfaceId": interfaceId, + "interfaceType": interfaceType, + } + _, err = a.AccessStorePage2("https://openo2o.jddj.com/sandBox/excuteInvoking.htm", jdParams, true, "") + return err +} + +//我要上线 +func (a *API) ToOnline() (err error) { + _, err = a.AccessStorePage2("https://openo2o.jddj.com/sandBox/toOnline.htm", nil, true, "") + return err +} diff --git a/platformapi/jdapi/store_page_test.go b/platformapi/jdapi/store_page_test.go index d71feac9..695ebed4 100644 --- a/platformapi/jdapi/store_page_test.go +++ b/platformapi/jdapi/store_page_test.go @@ -263,3 +263,39 @@ func TestGetJdStoreInfo(t *testing.T) { searchResult := skuNamePat.FindStringSubmatch(str) fmt.Println(searchResult) } + +func TestUpdateInterStatus(t *testing.T) { + err := api.UpdateInterStatus("f93ddfb7034b468da4d1ef10abe4b3ab", "message.djsw.newOrder", 0) + if err != nil { + t.Fatal(err) + } + // fmt.Println(result) +} + +func TestSaveMsgUrl(t *testing.T) { + err := api.SaveMsgUrl("f93ddfb7034b468da4d1ef10abe4b3ab", "http://callback.test.jxc4.com", "http://callback.jxc4.com", 0) + if err != nil { + t.Fatal(err) + } + // fmt.Println(result) +} + +func TestExcuteInvoking(t *testing.T) { + err := api.ExcuteInvoking("e95911589479472e8b6f4d099ad343b5", 0) + if err != nil { + t.Fatal(err) + } + // fmt.Println(result) +} + +func TestPeiZhiJdZhangHao(t *testing.T) { + for k, v := range interfaceMap { + if err := api.UpdateInterStatus(k, v[0].(string), v[1].(int)); err == nil { + if err2 := api.SaveMsgUrl(k, "http://callback.test.jxc4.com", "http://callback.jxc4.com", v[1].(int)); err2 == nil { + if err3 := api.ExcuteInvoking(k, v[1].(int)); err3 == nil { + } + } + } + } + // api.ToOnline() +} diff --git a/platformapi/jdapi/store_test.go b/platformapi/jdapi/store_test.go index 3f8e5fca..2330867e 100644 --- a/platformapi/jdapi/store_test.go +++ b/platformapi/jdapi/store_test.go @@ -42,7 +42,7 @@ func TestGetStationsByVenderId(t *testing.T) { } func TestGetStoreInfoByStationNo(t *testing.T) { - result, err := api.GetStoreInfoByStationNo2("12083436") + result, err := api.GetStoreInfoByStationNo2("11980668") if err != nil { t.Fatal(err) } @@ -144,11 +144,10 @@ func TestUpdateStoreFreightConfigNew(t *testing.T) { } func TestGetDeliveryRangeByStationNo(t *testing.T) { - const testStoreID = "11738048" + const testStoreID = "11980668" result, err := api.GetDeliveryRangeByStationNo2(testStoreID) if err != nil { t.Fatal(err) } baseapi.SugarLogger.Debug(utils.Format4Output(result, false)) - // fmt.Println("tetet11111111111111111111111111111111", computeSignedArea(strings.Split(result.DeliveryRange, ";"))) } diff --git a/platformapi/mtwmapi/shipping_test.go b/platformapi/mtwmapi/shipping_test.go index a60236d9..64cf58f1 100644 --- a/platformapi/mtwmapi/shipping_test.go +++ b/platformapi/mtwmapi/shipping_test.go @@ -22,7 +22,7 @@ func TestShippingList(t *testing.T) { } func TestShippingFetch(t *testing.T) { - result, err := api.ShippingFetch(testPoiCode) + result, err := api.ShippingFetch("9252885") if err != nil { t.Fatal(err) }