From d356ac894c9866dfb87aec5de0578e21231de108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Mon, 1 Mar 2021 11:15:14 +0800 Subject: [PATCH] aa --- platformapi/jdshopapi/jxshopapi_test.go | 2 +- platformapi/jdshopapi/store_page.go | 32 ++++++++++++++++-- platformapi/jdshopapi/store_page_test.go | 41 +++++++++++------------- 3 files changed, 49 insertions(+), 26 deletions(-) diff --git a/platformapi/jdshopapi/jxshopapi_test.go b/platformapi/jdshopapi/jxshopapi_test.go index def5af21..0d3d3b8b 100644 --- a/platformapi/jdshopapi/jxshopapi_test.go +++ b/platformapi/jdshopapi/jxshopapi_test.go @@ -17,7 +17,7 @@ func init() { api = New("de8157b447584885910f429011e49cb93yjq", "E1D746D42474D5F1F1A10CECE75D99F6", "efa7e1d1a22640fa990e6cf164b28608") // api = New("9ad9cf5fc8b140b19a1dbbb700b47676kown", "D5E8352BE0786ED16F77B4548F62F09A", "71e1061ac2f246f6ac27efb900edba12") api.SetCookieWithStr(` - shshshfpa=13b38d4a-8ba0-df12-0012-82d9a37fb835-1573795914; shshshfpb=abYp8Dq5JobRtp2pkZa7MbA%3D%3D; track=46099cdb-39fb-abe6-579e-ea9536a8cf9c; mba_muid=1605755815875269445822; TrackerID=E6aNCj4mNlBVkq6eyFfWLvkbWl9DhdG-pRGVaQPbvt2ewCa2n0QM-p0mViOLv_Uem9pAWgbNZEeaJuaz4gARAW9rTj8PJK-3hmcbl9N9h1qg-DMYXvdwc3Iau-AMlWin29CojqE8YnUPMtlJUf2gnA; pt_token=y2wjxzef; pwdt_id=jd_5e10f2d70fb4c; navigation=[%22shop_jxcs2020%22]; shshshfp=34eda22ad0af63b76392daccd2d03f2e; language=zh_CN; cid=NWtRMjE2NndZMzc4N2hWNzMyOHFBNDcwMXdTMjEwMm9BMjE4M3JPNjkwNHJQODk2; 3AB9D23F7A4B3C9B=AK36FFYF5J6WMPRH7YTXMEX4CATHR6NAA3IQEESU2I33FEJRQ3DRLU4SZJYD2XGFLCFW43DHYP5HQKOMR4EFQSLKLA; __jdu=1591327001141529223150; ipLoc-djd=22-1930-50946-0; areaId=22; __jdv=27966078|direct|-|none|-|1606900892557; TrackID=1a8rQQSq1sFk5aIdLeLTVrOTVhvnEOIbGvhQrrm5DNzXMnL2_JskbaZzs3Y0ideGNm7QNOoH94eRaus8Ai2bAObQympPYAlbqiwimxz4D0Rg; thor=5E1D1AE7BBC42FACA3496D9C54AF9F879CF4836860E75FF70BFCDEAC5A75C1C50F3E6B265A849138B3E7FC3D78B31DE6C5BD8AF5785F77BC9AE3DFBC7C4BA8EA53AAB189B73DCCF68F7926382B9C48653303DF509ED282449ED2E87F942C16C040864A97C8A45FC10A8EE326CF295FD8F844D358C494059AC43E50D27F8107618E19AD7F8930098585699CE84D267FF3; pinId=WMIzMhF5BfI9awOQjAcbdQ; pin=shop_jxcs2020; unick=shop_jxcs2020; ceshi3.com=000; _tp=VqmxIvk3BVEJnO6UciQrRA%3D%3D; logining=1; _pst=shop_jxcs2020; csrf_token=4a52ecd2-617a-492d-8f48-edcdb4ecd2e7; __jda=191954476.1591327001141529223150.1591327001.1606985570.1607042687.77; __jdc=191954476; b-sec=S2JWP6CAFP7K44GG6BEY2DLMRHSHR25YQUFIV6WEFNUTVWLNHZ33I6SONCPM62KJUF3MDNTKH6FVA; _base_=YKH2KDFHMOZBLCUV7NSRBWQUJPBI7JIMU5R3EFJ5UDHJ5LCU7R2NILKK5UJ6GLA2RGYT464UKXAI4Z6HPCTN4UQM3WHVQ4ENFP57OC2NCIWTST4KDNCWZES6EV2TD5XDTCNE6YVKRXISVWNQHZDBO6QEKYXMXGPYGVEOCQCSG4SOQWCP5WPWO6EFS7HEHMRWVKBRVHB33TFD4AUHV3TOJD7MGBX53BNNP2E6MSSOORYGL5H2GYFRURR5ACFJ54GH7PTHFL22YL3C6ODFYFTWGV5UAWCX5C6J372TDCL6LDNEERERTGCSRYFAKBPUM6FURPWGDQJPYEE3TVQAQIWW3S2YBFMIMTF6SWAFAQ52UF5TATP7KZIQ; _BELONG_CLIENT_=WPSC4XJXWK5USS4JNZY2X7VRLR5MCBKRSVHEXABGTHDGISIQK5YOLZUXYE7IOIM7MOKO74H6CRN6WHAAR4TMDV3XZWMXZRCRT5XRNE3V356BTOB2Y7LPK66VWQK6HPTGWVXIDXDCPVE3W5WMHAIO6AT2LX2XXVNUCXR34ZWFK6HY45CORGIKOSYDYZBF27WOKTUX6BS4FZMIJWNUX6CB4JAA25ZLF7ZEKYOO4QV5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BMTUJZACIBHXQFAVLRF76VQY5PNJGGJNBEZHSFYYJA3YORRT7FB5AHCOIFQKF3W5RWNUX6CB4JAA26JNMO7AYWNUPZF5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BWZDKMOJ5BS6II53ERY6ALV3ZWPF42L4CPUHEGPYIII35KDC4FCNVCORCXFD6IVNLBEDPB2GGP4UHWNRUDOQBDIW7RZJXBA2WV5ANZOTEGUCDWYRVQS2YUTIZNZ276PRYG4N56V6YTII7MBKBC7LYHO7C555HTSBXGNRM3E466AYN67DHWVM5HQFJ4NFDO5BSXLZASHCYCB4YTLPK4F52SLHSTY; _vender_new_=GI63BGTJFDBQ4KTM333PMOGFGXGN2MWJNA4WUIW4ZGGIVOLTPK5TRV2UVRGJOLSZFF5XPPV376V2IZYUUTIZYUOSJ7XLQQXULY7UZCFHNUYZEPA5K4NKJ62CC6Q756VRE47INBENIPCNYN4MUZRCB27NNIDWST32H7A66G2G3UMJWUPPXMHKRJ4I6UJ43SNLTY755O3QKSMGQHPHSOAKK5R74V6PBVCLI56OPZPR7RNFOAEYFZTP2BSCS5ZMNTWN4HIOX5NUKDT5E75AVXNKX43RBTJ6W255CTVTEQ67VYYOGAEFV3CBL4MM5MFU6T2V7DWAKVLHWY2IK72YOJU4FK5DKJNAQTGREVXCTV3IFMZQODLJ74H7RXGVJKSRURJWLIEEZUJFNYU5O2BLGMDQ22P7B54BBC6T7IT4RBGRQHU63BU24NLT3B722WUBKZ7XZVGJA3N5V5QQZAJ27O3QLTP5M5YE6OWLQPEH5LY76SIQJO62K63LPG6XGQM4I32SFFJR3R5NLQZPFLJTI6K74ICYFOP5LP54YOAU3MF223TH7RBNDQKQZAJGFHE3CEO3PDGTDMTFA3LOKDRYE3RCNZ3IIQEQZ3EKQ7Y7EZPHVW2EPN7W4FOKDTFUR4TGVDUVRCUSIBFN27HVOQHR76CSXAVCZU + shshshfpa=13b38d4a-8ba0-df12-0012-82d9a37fb835-1573795914; shshshfpb=abYp8Dq5JobRtp2pkZa7MbA%3D%3D; 3AB9D23F7A4B3C9B=AK36FFYF5J6WMPRH7YTXMEX4CATHR6NAA3IQEESU2I33FEJRQ3DRLU4SZJYD2XGFLCFW43DHYP5HQKOMR4EFQSLKLA; mba_muid=1605755815875269445822; TrackerID=E6aNCj4mNlBVkq6eyFfWLvkbWl9DhdG-pRGVaQPbvt2ewCa2n0QM-p0mViOLv_Uem9pAWgbNZEeaJuaz4gARAW9rTj8PJK-3hmcbl9N9h1qg-DMYXvdwc3Iau-AMlWin29CojqE8YnUPMtlJUf2gnA; navigation=[%22shop_jxcs2020%22]; cid=NWtRMjE2NndZMzc4N2hWNzMyOHFBNDcwMXdTMjEwMm9BMjE4M3JPNjkwNHJQODk2; __jdu=1591327001141529223150; is_sz_old_version=false; shshshfp=aca925e1fc76f263780243d0f99d024b; __jdv=95931165|direct|-|none|-|1613808309597; pinId=WMIzMhF5BfI9awOQjAcbdQ; pin=shop_jxcs2020; unick=shop_jxcs2020; _tp=VqmxIvk3BVEJnO6UciQrRA%3D%3D; _pst=shop_jxcs2020; language=zh_CN; 3AB9D23F7A4B3C9B=AK36FFYF5J6WMPRH7YTXMEX4CATHR6NAA3IQEESU2I33FEJRQ3DRLU4SZJYD2XGFLCFW43DHYP5HQKOMR4EFQSLKLA; TrackID=1EFYZrhrYtBIzlzxV-Qt5W03EUy8QSm57B6O73b3K84aLcCz2lnoG-hozYuoAKv0OPgw_zdMgDZJFDpKAKoQmPmx8RrNUyV9vogaHhuMFHZ4; thor=5E1D1AE7BBC42FACA3496D9C54AF9F879CF4836860E75FF70BFCDEAC5A75C1C54EA55CD7CAFD583BFA0BFE44711C08930D3B0C3E6B9625A94D300275A87F60F8C34BA8DB9E2B51B2DEB6F7B2CF0C000D0B09CD4A5ADBC9E8BDA494702E0B0D1068AB0843B840807279F32AAE365A2E6D009A5F944A83C42A587513710D25EA30E7AA3788069D678B8395A0438FEB42C4; ceshi3.com=000; __jda=220467782.1591327001141529223150.1591327001.1614328181.1614563912.97; __jdb=220467782.11.1591327001141529223150|97.1614563912; __jdc=220467782; _vender_new_=GI63BGTJFDBQ4KTM333PMOGFGXGN2MWJNA4WUIW4ZGGIVOLTPK5TRV2UVRGJOLSZFF5XPPV376V2IZYUUTIZYUOSJ7XLQQXULY7UZCFHNUYZEPA5K4NKJ62CC6Q756VRE47INBENIPCNYN4MUZRCB27NNIDWST32H7A66G2G3UMJWUPPXMHKRJ4I6UJ43SNLTY755O3QKSMGQHPHSOAKK5R74V6PBVCLI56OPZPR7RNFOAEYFZTP2BSCS5ZMNTWN4HIOX5NUKDT5E75AVXNKX43RBTJ6W255CTVTEQ67VYYOGAEFV3CBL4MM5MFU6T2V7DWAKVLHWY2IK72YOJU4FK5DKIV32N6EAANWOKFSNK676TGVJ3LPRXGVJKSRURJWFO6TPRAADNTSRMTKXX7UZVKO2Z4BBC6T7IT4RBGRQHU63BU24NLT3B722WUBKZ7XZVGJA3N5V5QQZAJ27O3QLTP5M5YE6OWLQPEH5LY76SIQJO62K63LPG6XGQM4I32SFFJR3R5NLQZPFLJTI6K74ICYFOP5LP54YOAU3MF223TH7RBNDQKQZAJGFHE3CEO3PDGTDMTFA3LOKDRYE3RCNZ3IIQEQZ3EKQ7Y7EZPHVW2EPN7W4FOKDTFUR4TGVDUVCEPLCG66FUI6B7C5B5EV4I32VA; b-sec=S2JWP6CAFP7K44GG6BEY2DLMRHSHR25YQUFIV6XKMN7YQCYRMWS6VEV6SGCF5SZDP5CIPPUVWKPFY; _base_=YKH2KDFHMOZBLCUV7NSRBWQUJPBI7JIMU5R3EFJ5UDHJ5LCU7R2NILKK5UJ6GLA2RGYT464UKXAI4Z6HPCTN4UQM3WHVQ4ENFP57OC2NCIWTST4KDNCWZES6EV2TD5XDTCNE6YVKRXISVWNQHZDBO6QEKYXMXGPYGVEOCQCSG4SOQWCP5WPWO6EFS7HEHMRWVKBRVHB33TFD4AUHV3TOJD7MGBX53BNNP2E6MSSOORYGL5H2GYFRURR5ACFJ54GH7PTHFL22YL3C6ODFYFTWGV5UAWCX5C6J372TDCL6LDNEERERTGCZ7WF3JTKCYBOSOSICAK2I2KWSTVQAQIWW3S2YBFMIMTF6SWAFAQ52UF5TATP7KZIQ; _BELONG_CLIENT_=WPSC4XJXWK5USS4JNZY2X7VRLR5MCBKRSVHEXABGTHDGISIQK5YOLZUXYE7IOIM7MOKO74H6CRN6WHAAR4TMDV3XZWMXZRCRT5XRNE3V356BTOB2Y7LPK66VWQK6HPTGWVXIDXDCPVE3W5WMHAIO6AT2LX2XXVNUCXR34ZWFK6HY45CORGIKOSYDYZBF27WOKTUX6BS4FZMIJWNUX6CB4JAA25ZLF7ZEKYOO4QV5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BMTUJZACIBHXQFAVLRF76VQY5PNJGGJNBEZHSFYYJA3YORRT7FB5AHCOIFQKF3W5RWNUX6CB4JAA26JNMO7AYWNUPZF5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BWZDKMOJ5BS6II53ERY6ALV3ZWPF42L4CPUHEGPYIII35KDC4FCNVCORCXFD6IVNLBEDPB2GGP4UHWNRUDOQBDIW7RZJXBA2WV5ANZOTEGUCDWYRVQS2YUTIZNZ276PRYG4N56V6YTII7MBKBC7LYHO7C555HTSBXGNRM3E466AYN67DHWVM5HQFJ4NFDO5BTMX4UPHFMIWOK2WYI5GKJK2PWPQ `) // api.SetCookie("thor", "5E1D1AE7BBC42FACA3496D9C54AF9F879CF4836860E75FF70BFCDEAC5A75C1C5E43030CF54E4A3A8F5E760492948E69B763D115FE234A59948BA538A4F7E18F38B80F818E28EAE71F1CF5BFE2D0DC456D56E8BEAEF10D398C709D9A4EB46923C7E63867435BD42996F1570A816FD1B0B247CD9756A1184DD61317D28BBF77F828691684AD6E60801B2BB38F9DE086D73") diff --git a/platformapi/jdshopapi/store_page.go b/platformapi/jdshopapi/store_page.go index 5f529920..8d45e734 100644 --- a/platformapi/jdshopapi/store_page.go +++ b/platformapi/jdshopapi/store_page.go @@ -821,8 +821,8 @@ func (a *API) ShopList(pageNum int) (shopDetailResult *ShopListResult, err error "requestId": reqID, "pageNum": pageNum, "pageSize": 200, - "categoryId1": 3, - "categoryId2": 4, + "categoryId1": 34, + "categoryId2": 62, }, false) if err == nil { utils.Map2StructByJson(result["data"], &shopDetailResult, false) @@ -845,6 +845,34 @@ func (a *API) UpdateExpand(storeID int) (err error) { return err } +//更新门店围栏等 +//https://porder.shop.jd.com/order/orderlist/allOrders +func (a *API) CreateGisFence(storeID int) (err error) { + reqID := time.Now().Unix() + _, err = a.AccessStorePage2("https://o2o-stores.shop.jd.com/shop/createGisFence", map[string]interface{}{ + "storeIds": storeID, + "kilometres": 3, + "version": "1.0.0", + "source": "pc", + "requestId": reqID, + }, false) + return err +} + +//更新门店配送时效 +//https://porder.shop.jd.com/order/orderlist/allOrders +func (a *API) UpdateDeliveryPromise(start, end string, storeID int) (err error) { + _, err = a.AccessStorePage2("https://delivery.shop.jd.com/o2o/promise/update", map[string]interface{}{ + "storeIds": []int{storeID}, + "showCalendar": false, + "openHoursEnd": end, + "openHoursStart": start, + "immediateDelivery": true, + "agingType": 1, + }, true) + return err +} + //上传图片 //https://porder.shop.jd.com/order/orderlist/allOrders func (a *API) UploadImageNew(data []byte, fileName string) (jdURL string, err error) { diff --git a/platformapi/jdshopapi/store_page_test.go b/platformapi/jdshopapi/store_page_test.go index 049b5583..5ae2f2e5 100644 --- a/platformapi/jdshopapi/store_page_test.go +++ b/platformapi/jdshopapi/store_page_test.go @@ -8,8 +8,6 @@ import ( "fmt" "math" "sort" - "strconv" - "strings" "testing" "git.rosy.net.cn/baseapi/utils" @@ -219,6 +217,22 @@ func TestUpdateExpand(t *testing.T) { // t.Log(utils.Format4Output(result, false)) } +func TestCreateGisFence(t *testing.T) { + err := api.CreateGisFence(1000070143) + if err != nil { + t.Fatal(err) + } + // t.Log(utils.Format4Output(result, false)) +} + +func TestUpdateDeliveryPromise(t *testing.T) { + err := api.UpdateDeliveryPromise("09:00", "20:00", 1000070127) + if err != nil { + t.Fatal(err) + } + // t.Log(utils.Format4Output(result, false)) +} + func TestUploadImageNew(t *testing.T) { fmt.Println(calculate("1 - (2-(1-3))")) } @@ -226,26 +240,6 @@ func TestUploadImageNew(t *testing.T) { //给定一个包含正整数、加(+)、减(-)、乘(*)、除(/)的算数表达式(括号除外)，计算其结果。 //表达式仅包含非负整数，+， - ，*，/ 四种运算符和空格  。 整数除法仅保留整数部分。 func calculate(s string) int { - s = strings.ReplaceAll(s, " ", "") - var str []string - - changeNum := func(s string) int { - i, _ := strconv.Atoi(s) - return i - } - var ss []int - for { - kr := strings.Index(s, ")") - if k == -1 { - break - } - kl := strings.LastIndex(s[:k], "(") - s = s[:kl]+ - } - sum := 0 - for _, v := range ss { - sum += v - } return 1 } @@ -611,10 +605,11 @@ func maxUncrossedLines(A []int, B []int) (s int) { } func TestShopList(t *testing.T) { - result, err := api.ShopList(1) + result, err := api.ShopList(2) if err != nil { t.Fatal(err) } + fmt.Println("aaaaaaa", len(result.List)) t.Log(utils.Format4Output(result, false)) }