From 0ddc5efa12da88207a77a30a9e23c56d2a1bc451 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, 6 Apr 2021 14:09:33 +0800 Subject: [PATCH] aa --- platformapi/ebaiapi/order_test.go | 4 ++-- platformapi/jdshopapi/jxshopapi_test.go | 2 +- platformapi/jdshopapi/store_page.go | 8 ++++---- platformapi/jdshopapi/store_page_test.go | 7 ++++--- utils/routinepool/routinepool.go | 5 +++-- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/platformapi/ebaiapi/order_test.go b/platformapi/ebaiapi/order_test.go index 0856598d..cbb340f0 100644 --- a/platformapi/ebaiapi/order_test.go +++ b/platformapi/ebaiapi/order_test.go @@ -7,7 +7,7 @@ import ( ) func TestOrderGet(t *testing.T) { - result, err := api.OrderGet("5020191712108978238") + result, err := api.OrderGet("2147234624018417846") if err != nil { t.Fatal(err) } else { @@ -16,7 +16,7 @@ func TestOrderGet(t *testing.T) { } func TestOrderGet2(t *testing.T) { - result, err := api.OrderGet2("2141992244233627664") + result, err := api.OrderGet2("2147234624018417846") if err != nil { t.Fatal(err) } else { diff --git a/platformapi/jdshopapi/jxshopapi_test.go b/platformapi/jdshopapi/jxshopapi_test.go index e39d8dac..364cfff4 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; 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|-|1615164618495; pinId=WMIzMhF5BfI9awOQjAcbdQ; pin=shop_jxcs2020; unick=shop_jxcs2020; _tp=VqmxIvk3BVEJnO6UciQrRA%3D%3D; _pst=shop_jxcs2020; language=zh_CN; 3AB9D23F7A4B3C9B=AK36FFYF5J6WMPRH7YTXMEX4CATHR6NAA3IQEESU2I33FEJRQ3DRLU4SZJYD2XGFLCFW43DHYP5HQKOMR4EFQSLKLA; TrackID=1tYZPd78TorJ8LITY5sx9-A48dwgr5KZdVlAfWgHqyV5BXJl-a-Z_DTygN2-EASvtGJVdcu2D8EXmnJMeUDKVu6QXOKDLf6fXHwxIaTf_jwo; ceshi3.com=000; thor=5E1D1AE7BBC42FACA3496D9C54AF9F879CF4836860E75FF70BFCDEAC5A75C1C517698AE3A31C38B84F5D6614D27DDC081843FBAE2362E30585897F89B2E0F73E3A9C78B7A67026506807D25F6B20B114FF8AA6E3B579E560CF8059960C0A1825BCBFF0E8B68DA626A1DE5B1C8BC2E1C54BC4212036A6E6214EE52E0D7668CB233D946F9B49192FAFBB0420F662D6DE69; csrf_token=fbd7dc67-0cb5-42be-836d-91c1d7f45ac2; __jda=191954476.1591327001141529223150.1591327001.1615960972.1615969013.108; __jdb=191954476.2.1591327001141529223150|108.1615969013; __jdc=191954476; _base_=YKH2KDFHMOZBLCUV7NSRBWQUJPBI7JIMU5R3EFJ5UDHJ5LCU7R2NILKK5UJ6GLA2RGYT464UKXAI4Z6HPCTN4UQM3WHVQ4ENFP57OC2NCIWTST4KDNCWZES6EV2TD5XDTCNE6YVKRXISVWNQHZDBO6QEKYXMXGPYGVEOCQCSG4SOQWCP5WPWO6EFS7HEHMRWVKBRVHB33TFD4AUHV3TOJD7MGBX53BNNP2E6MSSOORYGL5H2GYFRURR5ACFJ54GH7PTHFL22YL3C6ODFYFTWGV5UAWCX5C6J372TDCL6LDNEERERTGCTBAX3PGPMZXZLVP535VTBVEXSNVQAQIWW3S2YBFMIMTF6SWAFAQ52UF5TATP7KZIQ; _BELONG_CLIENT_=WPSC4XJXWK5USS4JNZY2X7VRLR5MCBKRSVHEXABGTHDGISIQK5YOLZUXYE7IOIM7MOKO74H6CRN6WHAAR4TMDV3XZWMXZRCRT5XRNE3V356BTOB2Y7LPK66VWQK6HPTGWVXIDXDCPVE3W5WMHAIO6AT2LX2XXVNUCXR34ZWFK6HY45CORGIKOSYDYZBF27WOKTUX6BS4FZMIJWNUX6CB4JAA25ZLF7ZEKYOO4QV5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BMTUJZACIBHXQFAVLRF76VQY5PNJGGJNBEZHSFYYJA3YORRT7FB5AHCOIFQKF3W5RWNUX6CB4JAA26JNMO7AYWNUPZF5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BWZDKMOJ5BS6II53ERY6ALV3ZWPF42L4CPUHEGPYIII35KDC4FCNVCORCXFD6IVNLBEDPB2GGP4UHWNRUDOQBDIW7RZJXBA2WV5ANZOTEGUCDWYRVQS2YUTIZNZ276PRYG4N56V6YTII7MBKBC7LYHO7C555HTSBXGNRM3E466AYN67DHWVM5HQFJ4NFDO5BSK3GVLE5UOH2ZFN55T4D7N2CX6A; _vender_new_=GI63BGTJFDBQ4KTM333PMOGFGXGN2MWJNA4WUIW4ZGGIVOLTPK5TRV2UVRGJOLSZFF5XPPV376V2IZYUUTIZYUOSJ7XLQQXULY7UZCFHNUYZEPA5K4NKJ62CC6Q756VRE47INBENIPCNYN4MUZRCB27NNIDWST32H7A66G2G3UMJWUPPXMHKRJ4I6UJ43SNLTY755O3QKSMGQHPHSOAKK5R74V6PBVCLI56OPZPR7RNFOAEYFZTP2BSCS5ZMNTWN4HIOX5NUKDT5E75AVXNKX43RBTJ6W255CTVTEQ67VYYOGAEFV3CBL4MM5MFU6T2V7DWAKVLHWY2IK72YOJU4FK5DKLW2KJEMGDG73K2LT7HPY2AZQ5Y7RXGVJKSRURJW5WSSJDBQZX62WS47Z36GQGMHOF4BBC6T7IT4RBGRQHU63BU24NLT3B722WUBKZ7XZVGJA3N5V5QQZAJ27O3QLTP5M5YE6OWLQPEH5LY76SIQJO62K63LPG6XGQM4I32SFFJR3R5NLQZPFLJTI6K74ICYFOP5LP54YOAU3MF223TH7RBNDQKQZAJGFHE3CEO3PDGTDMTFA3LOKDRYE3RCNZ3IIQEQZ3EKQ7Y7EZPHVW2EPN7W4FOKDTFUR4TGVDUVVORYP5YAPLIM2PRUXJZMKDHKJA; b-sec=__jdu=1606959029585201168202; shshshfpa=fbd92c90-7328-457c-7b3d-be00ac14bc9a-1612147604; shshshfpb=l cngAeifBpA4rnWe1vFQEQ==; areaId=1; ipLoc-djd=1-2800-55811-0; unpl=V2_ZzNtbRBVR0InX0UEfRoLAGJXRgkRB0sRdwFDVSkbWAVvCxENclRCFnUUR1ZnGFwUZwQZWUZcRxZFCEdkeBBVAWMDE1VGZxBFLV0CFSNGF1wjU00zQwBBQHcJFF0uSgwDYgcaDhFTQEJ2XBVQL0oMDDdRFAhyZ0AVRQhHZHseXQJvBxpcQV9HHHELR1R7HlUGZgAibUVncyV1CUZdeBtsBFcCIh8WC0QXfAtPVzYZWwRgCxZVQ1RLEXwMRVV7GVsMZAIRbUNnQA==; user-key=44c97007-1b19-444e-8d2e-fc68439e5eda; cn=1; __jdv=209449046|baidu|-|organic|not set|1614828968850; shshshfp=5bce015e6393e7077584264cf5ee5aac; PCSYCityID=CN_510000_510100_510106; language=zh_CN; RT="z=1&dm=jd.com&si=nacjj1ypwoe&ss=kmcu1sgq&sl=1&tt=18t&ld=2gu&ul=3u3v&hd=3u46"; pinId=WMIzMhF5BfI9awOQjAcbdQ; pin=shop_jxcs2020; unick=shop_jxcs2020; _tp=VqmxIvk3BVEJnO6UciQrRA==; _pst=shop_jxcs2020; AESKEY=E05570173A46DCD2; QRCodeKEY=FF2E86C4AAF0FD7CA381C8AB02D4C76D2E02505A4D5003BBFF571C27A8E5E23B9D2938D1818DA81A6C2501F503C01641; UIDKEY=29106568973311115; 3AB9D23F7A4B3C9B=GFH7BFNYDIGOBQGDLTD5AJGQ7YX6B3WF5GYDYNFWEMNPUJWNKNSOSAODQEM3MKZGVQZZPKICOBD7VLUP2H765KBSWY; TrackID=1oGCh9OOrdCYf1GqVFa5hGICgtRSLI77ljAe4EZonBfYIyaza9tpYXorGTQ_1-hQEQMcNryyyWOMjFPz352saUGP0a2VBrVWJTNvdH594zkI; thor=5E1D1AE7BBC42FACA3496D9C54AF9F879CF4836860E75FF70BFCDEAC5A75C1C5317EE746124E106EBEF0E602047160EFDD8FBBB3A74465D12FB3D9DAFB8C67DEAB014B035DA766086AE432C86B3B0362E957E292A57C59FB1E17E00581DDA1CB2C7A5B329BE553C7594CF0ED194B749F3BDFE36BE52CA2F8C8BC34144D763E21E66A8CB691BA8A7D63C160D219EDB98B; ceshi3.com=000; _BELONG_CLIENT_=WPSC4XJXWK5USS4JNZY2X7VRLR5MCBKRSVHEXABGTHDGISIQK5YOLZUXYE7IOIM7MOKO74H6CRN6WHAAR4TMDV3XZWMXZRCRT5XRNE3V356BTOB2Y7LPK66VWQK6HPTGWVXIDXDCPVE3W5WMHAIO6AT2LX2XXVNUCXR34ZWFK6HY45CORGIKOSYDYZBF27WOKTUX6BS4FZMIJWNUX6CB4JAA25ZLF7ZEKYOO4QV5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BMTUJZACIBHXQFAVLRF76VQY5PNJGGJNBEZHSFYYJA3YORRT7FB5AHCOIFQKF3W5RWNUX6CB4JAA26JNMO7AYWNUPZF5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BWZDKMOJ5BS6II53ERY6ALV3ZWPF42L4CPUHEGPYIII35KDC4FCNVCORCXFD6IVNLBEDPB2GGP4UHWNRUDOQBDIW7RZJXBA2WV5ANZOTEGUCDWYRVQS2YUTIZNZ276PRYG4N56V6YTII7MBKBC7LYHO7C555HTSBXGNRM3E466AYN67DHWVM5HQFJ4NFDO5BSWQEATVFB4LWXPBBPCOP6M7XPMA; _vender_new_=GI63BGTJFDBQ4KTM333PMOGFGXGN2MWJNA4WUIW4ZGGIVOLTPK5TRV2UVRGJOLSZFF5XPPV376V2IZYUUTIZYUOSJ7XLQQXULY7UZCFHNUYZEPA5K4NKJ62CC6Q756VRE47INBENIPCNYN4MUZRCB27NNIDWST32H7A66G2G3UMJWUPPXMHKRJ4I6UJ43SNLTY755O3QKSMGQHPHSOAKK5R74V6PBVCLI56OPZPR7RNFOAEYFZTP2BSCS5ZMNTWN4HIOX5NUKDT5E75AVXNKX43RBTJ6W255CTVTEQ67VYYOGAEFV3CBL4MM5MFU6T2V7DWAKVLHWY2IK72YOJU4FK5DKKCGO53LOEOYY2NQ3RXUMXPY4JKPRXGVJKSRURJWQRTXO23RDWGGTMG4N5DF36HCKR4BBC6T7IT4RBGRQHU63BU24NLT3B722WUBKZ7XZVGJA3N5V5QQZAJ27O3QLTP5M5YE6OWLQPEH5LY76SIQJO62K63LPG6XGQM4I32SFFJR3R5NLQZPFLJTI6K74ICYFOP5LP54YOAU3MF223TH7RBNDQKQZAJGFHE3CEO3PDGTDMTFA3LOKDRYE3RCNZ3IIQEQZ3EKQ7Y7EZPHVW2EPN7W4FOKDTFUR4TGVDUVK4NLKCW42WOW2WZNOIMMGDS6WI; b-sec=S2JWP6CAFP7K44GG6BEY2DLMRE23Y5BGZ2GOUV47F3XQIGZHARW2F77GDIBXK6OQXSYQKIWYKR2GK; chat.jd.com=20170206; csrf_token=80235299-2797-4778-af3a-1f9bc130eea8; __jda=122270672.1606959029585201168202.1606959030.1615974533.1616029996.41; __jdb=122270672.6.1606959029585201168202|41.1616029996; __jdc=122270672; _base_=__jdu=1606959029585201168202; shshshfpa=fbd92c90-7328-457c-7b3d-be00ac14bc9a-1612147604; shshshfpb=l cngAeifBpA4rnWe1vFQEQ==; areaId=1; ipLoc-djd=1-2800-55811-0; unpl=V2_ZzNtbRBVR0InX0UEfRoLAGJXRgkRB0sRdwFDVSkbWAVvCxENclRCFnUUR1ZnGFwUZwQZWUZcRxZFCEdkeBBVAWMDE1VGZxBFLV0CFSNGF1wjU00zQwBBQHcJFF0uSgwDYgcaDhFTQEJ2XBVQL0oMDDdRFAhyZ0AVRQhHZHseXQJvBxpcQV9HHHELR1R7HlUGZgAibUVncyV1CUZdeBtsBFcCIh8WC0QXfAtPVzYZWwRgCxZVQ1RLEXwMRVV7GVsMZAIRbUNnQA==; user-key=44c97007-1b19-444e-8d2e-fc68439e5eda; cn=1; __jdv=209449046|baidu|-|organic|not set|1614828968850; shshshfp=5bce015e6393e7077584264cf5ee5aac; PCSYCityID=CN_510000_510100_510106; language=zh_CN; RT="z=1&dm=jd.com&si=nacjj1ypwoe&ss=kmcu1sgq&sl=1&tt=18t&ld=2gu&ul=3u3v&hd=3u46"; pinId=WMIzMhF5BfI9awOQjAcbdQ; pin=shop_jxcs2020; unick=shop_jxcs2020; _tp=VqmxIvk3BVEJnO6UciQrRA==; _pst=shop_jxcs2020; AESKEY=048525BD358FE162; QRCodeKEY=10F0141B75510642E9FC0CC6959926BBDFC2B273720EC49FED9C4C5D82EAE2F69D2938D1818DA81A6C2501F503C01641; UIDKEY=76876714066494378; 3AB9D23F7A4B3C9B=GFH7BFNYDIGOBQGDLTD5AJGQ7YX6B3WF5GYDYNFWEMNPUJWNKNSOSAODQEM3MKZGVQZZPKICOBD7VLUP2H765KBSWY; TrackID=1BmRJ-u017Km4SZyqw9HxggfT5LHAp_jSrwPyjGtVm4yHfEH3Wp5_d5YbG-CESSPFO2Xr_lbCJkUXHT_OsHwLEjdK1-BZoLt5ZxcTP2SCcLE; thor=5E1D1AE7BBC42FACA3496D9C54AF9F879CF4836860E75FF70BFCDEAC5A75C1C513C03854FA9AADC4A68DD0A574701C2CEE9663C18BCC32F69C7D205CDCEB5A0DB2F4C3B53A0C62B2A59231B341A1CDA7AD90DFD80B7751D3CED1C14451D2E0BABE633B4EA3965820F484C7683CBF7337B044D520691BFDCA0C4AEA9EB4AC7B5F29D34A70A3F1EDF8A6C78A8C933EC78A; ceshi3.com=000; _BELONG_CLIENT_=WPSC4XJXWK5USS4JNZY2X7VRLR5MCBKRSVHEXABGTHDGISIQK5YOLZUXYE7IOIM7MOKO74H6CRN6WHAAR4TMDV3XZWMXZRCRT5XRNE3V356BTOB2Y7LPK66VWQK6HPTGWVXIDXDCPVE3W5WMHAIO6AT2LX2XXVNUCXR34ZWFK6HY45CORGIKOSYDYZBF27WOKTUX6BS4FZMIJWNUX6CB4JAA25ZLF7ZEKYOO4QV5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BMTUJZACIBHXQFAVLRF76VQY5PNJGGJNBEZHSFYYJA3YORRT7FB5AHCOIFQKF3W5RWNUX6CB4JAA26JNMO7AYWNUPZF5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BWZDKMOJ5BS6II53ERY6ALV3ZWPF42L4CPUHEGPYIII35KDC4FCNVCORCXFD6IVNLBEDPB2GGP4UHWNRUDOQBDIW7RZJXBA2WV5ANZOTEGUCDWYRVQS2YUTIZNZ276PRYG4N56V6YTII7MBKBC7LYHO7C555HTSBXGNRM3E466AYN67DHWVM5HQFJ4NFDO5BSCBBMC24LSK4EQPO6U3EWNQEGMA; _vender_new_=GI63BGTJFDBQ4KTM333PMOGFGXGN2MWJNA4WUIW4ZGGIVOLTPK5TRV2UVRGJOLSZFF5XPPV376V2IZYUUTIZYUOSJ7XLQQXULY7UZCFHNUYZEPA5K4NKJ62CC6Q756VRE47INBENIPCNYN4MUZRCB27NNIDWST32H7A66G2G3UMJWUPPXMHKRJ4I6UJ43SNLTY755O3QKSMGQHPHSOAKK5R74V6PBVCLI56OPZPR7RNFOAEYFZTP2BSCS5ZMNTWN4HIOX5NUKDT5E75AVXNKX43RBTJ6W255CTVTEQ67VYYOGAEFV3CBL4MM5MFU6T2V7DWAKVLHWY2IK72YOJU4FK5DKJJU3KOCJB3FBEN3LDMD2RTZPA27RXGVJKSRURJWKNG2TQSIOZIJDO2Y3A6UM6LYGV4BBC6T7IT4RBGRQHU63BU24NLT3B722WUBKZ7XZVGJA3N5V5QQZAJ27O3QLTP5M5YE6OWLQPEH5LY76SIQJO62K63LPG6XGQM4I32SFFJR3R5NLQZPFLJTI6K74ICYFOP5LP54YOAU3MF223TH7RBNDQKQZAJGFHE3CEO3PDGTDMTFA3LOKDRYE3RCNZ3IIQEQZ3EKQ7Y7EZPHVW2EPN7W4FOKDTFUR4TGVDUVFKWBP75TTZ5TQN2YXEWZGWFHOA; b-sec=S2JWP6CAFP7K44GG6BEY2DLMRE23Y5BGZ2GOUV47F3XQIGZHARWQGDB3D7BVUBZPGGKGX6EEHDQB4; csrf_token=f2a8ec97-a0fd-4416-b38a-0eb83e038851; __jda=122270672.1606959029585201168202.1606959030.1616059159.1616116337.46; __jdb=122270672.4.1606959029585201168202|46.1616116337; __jdc=122270672; _base_=__jdu=1606959029585201168202; shshshfpa=fbd92c90-7328-457c-7b3d-be00ac14bc9a-1612147604; shshshfpb=l cngAeifBpA4rnWe1vFQEQ==; areaId=1; ipLoc-djd=1-2800-55811-0; unpl=V2_ZzNtbRBVR0InX0UEfRoLAGJXRgkRB0sRdwFDVSkbWAVvCxENclRCFnUUR1ZnGFwUZwQZWUZcRxZFCEdkeBBVAWMDE1VGZxBFLV0CFSNGF1wjU00zQwBBQHcJFF0uSgwDYgcaDhFTQEJ2XBVQL0oMDDdRFAhyZ0AVRQhHZHseXQJvBxpcQV9HHHELR1R7HlUGZgAibUVncyV1CUZdeBtsBFcCIh8WC0QXfAtPVzYZWwRgCxZVQ1RLEXwMRVV7GVsMZAIRbUNnQA==; user-key=44c97007-1b19-444e-8d2e-fc68439e5eda; cn=1; __jdv=209449046|baidu|-|organic|not set|1614828968850; shshshfp=5bce015e6393e7077584264cf5ee5aac; PCSYCityID=CN_510000_510100_510106; language=zh_CN; RT="z=1&dm=jd.com&si=nacjj1ypwoe&ss=kmcu1sgq&sl=1&tt=18t&ld=2gu&ul=3u3v&hd=3u46"; pinId=WMIzMhF5BfI9awOQjAcbdQ; pin=shop_jxcs2020; unick=shop_jxcs2020; _tp=VqmxIvk3BVEJnO6UciQrRA==; _pst=shop_jxcs2020; AESKEY=048525BD358FE162; QRCodeKEY=10F0141B75510642E9FC0CC6959926BBDFC2B273720EC49FED9C4C5D82EAE2F69D2938D1818DA81A6C2501F503C01641; UIDKEY=76876714066494378; 3AB9D23F7A4B3C9B=GFH7BFNYDIGOBQGDLTD5AJGQ7YX6B3WF5GYDYNFWEMNPUJWNKNSOSAODQEM3MKZGVQZZPKICOBD7VLUP2H765KBSWY; TrackID=1BmRJ-u017Km4SZyqw9HxggfT5LHAp_jSrwPyjGtVm4yHfEH3Wp5_d5YbG-CESSPFO2Xr_lbCJkUXHT_OsHwLEjdK1-BZoLt5ZxcTP2SCcLE; thor=5E1D1AE7BBC42FACA3496D9C54AF9F879CF4836860E75FF70BFCDEAC5A75C1C513C03854FA9AADC4A68DD0A574701C2CEE9663C18BCC32F69C7D205CDCEB5A0DB2F4C3B53A0C62B2A59231B341A1CDA7AD90DFD80B7751D3CED1C14451D2E0BABE633B4EA3965820F484C7683CBF7337B044D520691BFDCA0C4AEA9EB4AC7B5F29D34A70A3F1EDF8A6C78A8C933EC78A; ceshi3.com=000; _BELONG_CLIENT_=WPSC4XJXWK5USS4JNZY2X7VRLR5MCBKRSVHEXABGTHDGISIQK5YOLZUXYE7IOIM7MOKO74H6CRN6WHAAR4TMDV3XZWMXZRCRT5XRNE3V356BTOB2Y7LPK66VWQK6HPTGWVXIDXDCPVE3W5WMHAIO6AT2LX2XXVNUCXR34ZWFK6HY45CORGIKOSYDYZBF27WOKTUX6BS4FZMIJWNUX6CB4JAA25ZLF7ZEKYOO4QV5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BMTUJZACIBHXQFAVLRF76VQY5PNJGGJNBEZHSFYYJA3YORRT7FB5AHCOIFQKF3W5RWNUX6CB4JAA26JNMO7AYWNUPZF5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BWZDKMOJ5BS6II53ERY6ALV3ZWPF42L4CPUHEGPYIII35KDC4FCNVCORCXFD6IVNLBEDPB2GGP4UHWNRUDOQBDIW7RZJXBA2WV5ANZOTEGUCDWYRVQS2YUTIZNZ276PRYG4N56V6YTII7MBKBC7LYHO7C555HTSBXGNRM3E466AYN67DHWVM5HQFJ4NFDO5BSCBBMC24LSK4EQPO6U3EWNQEGMA; _vender_new_=GI63BGTJFDBQ4KTM333PMOGFGXGN2MWJNA4WUIW4ZGGIVOLTPK5TRV2UVRGJOLSZFF5XPPV376V2IZYUUTIZYUOSJ7XLQQXULY7UZCFHNUYZEPA5K4NKJ62CC6Q756VRE47INBENIPCNYN4MUZRCB27NNIDWST32H7A66G2G3UMJWUPPXMHKRJ4I6UJ43SNLTY755O3QKSMGQHPHSOAKK5R74V6PBVCLI56OPZPR7RNFOAEYFZTP2BSCS5ZMNTWN4HIOX5NUKDT5E75AVXNKX43RBTJ6W255CTVTEQ67VYYOGAEFV3CBL4MM5MFU6T2V7DWAKVLHWY2IK72YOJU4FK5DKJJU3KOCJB3FBEN3LDMD2RTZPA27RXGVJKSRURJWKNG2TQSIOZIJDO2Y3A6UM6LYGV4BBC6T7IT4RBGRQHU63BU24NLT3B722WUBKZ7XZVGJA3N5V5QQZAJ27O3QLTP5M5YE6OWLQPEH5LY76SIQJO62K63LPG6XGQM4I32SFFJR3R5NLQZPFLJTI6K74ICYFOP5LP54YOAU3MF223TH7RBNDQKQZAJGFHE3CEO3PDGTDMTFA3LOKDRYE3RCNZ3IIQEQZ3EKQ7Y7EZPHVW2EPN7W4FOKDTFUR4TGVDUVFKWBP75TTZ5TQN2YXEWZGWFHOA; b-sec=S2JWP6CAFP7K44GG6BEY2DLMRE23Y5BGZ2GOUV47F3XQIGZHARWQGDB3D7BVUBZPGGKGX6EEHDQB4; csrf_token=f2a8ec97-a0fd-4416-b38a-0eb83e038851; __jda=122270672.1606959029585201168202.1606959030.1616059159.1616116337.46; __jdb=122270672.4.1606959029585201168202|46.1616116337; __jdc=122270672; _base_=YKH2KDFHMOZBLCUV7NSRBWQUJPBI7JIMU5R3EFJ5UDHJ5LCU7R2NILKK5UJ6GLA2RGYT464UKXAI4Z6HPCTN4UQM3WHVQ4ENFP57OC2NCIWTST4KDNCWZES6EV2TD5XDTCNE6YVKRXISVWNQHZDBO6QEKYXMXGPYGVEOCQCSG4SOQWCP5WPWO6EFS7HEHMRWVKBRVHB33TFD4AUHV3TOJD7MGBX53BNNP2E6MSSOORYGL5H2GYFRURR5ACFJ54GH7PTHFL22YL3C6ODFYFTWGV5UAWCX5C6J372TDCL6LDNEERERTGC3O5OXICYSM55WNUTIDT4PSKFEXVQAQIWW3S2YBFMIMTF6SWAFAQ52UF5TATP7KZIQ +shshshfpa=13b38d4a-8ba0-df12-0012-82d9a37fb835-1573795914; shshshfpb=abYp8Dq5JobRtp2pkZa7MbA%3D%3D; 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|-|1616570480674; language=zh_CN; ceshi3.com=000; TrackID=1ZyhyaJzuZ0Y75QUWtrbz96THHCZEH4l_KB0FWR6cvWbj_P07qtr9wt43WNCJv0DIGkq3f7k_pjCccklc9F97YVU5il_x0M1UrRzPhm6ZKV4; pinId=WMIzMhF5BfI9awOQjAcbdQ; pin=shop_jxcs2020; unick=shop_jxcs2020; _tp=VqmxIvk3BVEJnO6UciQrRA%3D%3D; _pst=shop_jxcs2020; __jda=191429163.1591327001141529223150.1591327001.1617674739.1617678725.110; __jdc=191429163; _base_=YKH2KDFHMOZBLCUV7NSRBWQUJPBI7JIMU5R3EFJ5UDHJ5LCU7R2NILKK5UJ6GLA2RGYT464UKXAI4Z6HPCTN4UQM3WHVQ4ENFP57OC2NCIWTST4KDNCWZES6EV2TD5XDTCNE6YVKRXISVWNQHZDBO6QEKYXMXGPYGVEOCQCSG4SOQWCP5WPWO6EFS7HEHMRWVKBRVHB33TFD4AUHV3TOJD7MGBX53BNNP2E6MSSOORYGL5H2GYFRURR5ACFJ54GH7PTHFL22YL3C6ODFYFTWGV5UAWCX5C6J372TDCL6LDNEERERTGCRTIU3ZIR7YMUZMNJBSYKIHZQPJVQAQIWW3S2YBFMIMTF6SWAFAQ52UF5TATP7KZIQ; _vender_new_=GI63BGTJFDBQ4KTM333PMOGFGXGN2MWJNA4WUIW4ZGGIVOLTPK5TRV2UVRGJOLSZFF5XPPV376V2IZYUUTIZYUOSJ7XLQQXULY7UZCFHNUYZEPA5K4NKJ62CC6Q756VRE47INBENIPCNYN4MUZRCB27NNIDWST32H7A66G2G3UMJWUPPXMHKRJ4I6UJ43SNLTY755O3QKSMGQHPHSOAKK5R74V6PBVCLI56OPZPR7RNFOAEYFZTP2BSCS5ZMNTWN4HIOX5NUKDT5E75AVXNKX43RBTJ6W255CTVTEQ67VYYOGAEFV3CBL4MM5MFU6T2V7DWAKVLHWY2IK72YOJU4FK5DKJIF7GGQ6SL23LRHI5WFYWBIOTF7RXGVJKSRURJWKBPZRUHUS6W24J2HNROFQKDUZN4BBC6T7IT4RBGRQHU63BU24NLT3B722WUBKZ7XZVGJA3N5V5QQZAJ27O3QLTP5M5YE6OWLQPEH5LY76SIQJO62K63LPG6XGQM4I32SFFJR3R5NLQZPFLJTI6K74ICYFOP5LP54YOAU3MF223TH7RBNDQKQZAJGFHE3CEO3PDGTDMTFA3LOKDRYE3RCNZ3IIQEQZ3EKQ7Y7EZPHVW2EPN7W4FOKDTFUR4TGVDUVGRPS4RRDY2MOUBJK7MGDTCQX6A; _BELONG_CLIENT_=WPSC4XJXWK5USS4JNZY2X7VRLR5MCBKRSVHEXABGTHDGISIQK5YOLZUXYE7IOIM7MOKO74H6CRN6WHAAR4TMDV3XZWMXZRCRT5XRNE3V356BTOB2Y7LPK66VWQK6HPTGWVXIDXDCPVE3W5WMHAIO6AT2LX2XXVNUCXR34ZWFK6HY45CORGIKOSYDYZBF27WOKTUX6BS4FZMIJWNUX6CB4JAA25ZLF7ZEKYOO4QV5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BMTUJZACIBHXQFAVLRF76VQY5PNJGGJNBEZHSFYYJA3YORRT7FB5AHCOIFQKF3W5RWNUX6CB4JAA26JNMO7AYWNUPZF5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BWZDKMOJ5BS6II53ERY6ALV3ZWPF42L4CPUHEGPYIII35KDC4FCNVCORCXFD6IVNLBEDPB2GGP4UHWNRUDOQBDIW7RZJXBA2WV5ANZOTEGUCDWYRVQS2YUTIZNZ276PRYG4N56V6YTII7MBKBC7LYHO7C555HTSBXGNRM3E466AYN67DHWVM5HQFJ4NFDO5BSEDURI5I7FVJOXJMBP3436EKNSQ; b-sec=S2JWP6CAFP7K44GG6BEY2DLMRHSHR25YQUFIV6QATEYCZYCN2UAWIVV4SMO3MTZNV4X5INSNYNH72; chat.jd.com=20170206; __jdb=191429163.5.1591327001141529223150|110.1617678725; thor=5E1D1AE7BBC42FACA3496D9C54AF9F879CF4836860E75FF70BFCDEAC5A75C1C52D959FCCC6A240A67F16F1CDA2BA61152067762E2EA90C2E91E4759F1B3D8E33E6F34EAD3F271A9D7A0C204BAF172D6677900B777D50A49612F0923F7F1C93B66C6C1A4599268196BC5E919E228D870DFE69A8DB58ABBB71A2276D1BB05A0712D7B36FC122A7203B0F625E012E80046C; 3AB9D23F7A4B3C9B=AK36FFYF5J6WMPRH7YTXMEX4CATHR6NAA3IQEESU2I33FEJRQ3DRLU4SZJYD2XGFLCFW43DHYP5HQKOMR4EFQSLKLA `) // api.SetCookie("thor", "5E1D1AE7BBC42FACA3496D9C54AF9F879CF4836860E75FF70BFCDEAC5A75C1C5E43030CF54E4A3A8F5E760492948E69B763D115FE234A59948BA538A4F7E18F38B80F818E28EAE71F1CF5BFE2D0DC456D56E8BEAEF10D398C709D9A4EB46923C7E63867435BD42996F1570A816FD1B0B247CD9756A1184DD61317D28BBF77F828691684AD6E60801B2BB38F9DE086D73") diff --git a/platformapi/jdshopapi/store_page.go b/platformapi/jdshopapi/store_page.go index 658b1f67..f49c4d9f 100644 --- a/platformapi/jdshopapi/store_page.go +++ b/platformapi/jdshopapi/store_page.go @@ -329,7 +329,7 @@ type AllOrdersParam struct { OrderID string `json:"orderId"` SkuName string `json:"skuName"` OrderCreateDateRange []string `json:"orderCreateDateRange"` - OrderCompleteDateRange []interface{} `json:"orderCompleteDateRange"` + OrderCompleteDateRange []interface{} `json:"orderCompleteDateRange",omitempty` ReceiverName string `json:"receiverName"` ReceiverTel string `json:"receiverTel"` UserPin string `json:"userPin"` @@ -341,7 +341,7 @@ type AllOrdersParam struct { DeliveryType string `json:"deliveryType"` StoreID string `json:"storeId"` HuoHao string `json:"huoHao"` - OrderStatusArray []interface{} `json:"orderStatusArray"` + OrderStatusArray []string `json:"orderStatusArray,omitempty"` SelectedTabName string `json:"selectedTabName"` } @@ -484,8 +484,8 @@ func (a *API) AllOrders(allOrdersParam *AllOrdersParam) (allOrdersResult *AllOrd "sortName": "desc", "orderCreateDateRange": allOrdersParam.OrderCreateDateRange, // "storeId": allOrdersParam.StoreID, - "orderStatusArray": allOrdersParam.OrderStatusArray, - "orderId": allOrdersParam.OrderID, + // "orderStatusArray": allOrdersParam.OrderStatusArray, + "orderId": allOrdersParam.OrderID, }, true) if err == nil { utils.Map2StructByJson(result, &allOrdersResult, false) diff --git a/platformapi/jdshopapi/store_page_test.go b/platformapi/jdshopapi/store_page_test.go index 0be6bf0f..ee136374 100644 --- a/platformapi/jdshopapi/store_page_test.go +++ b/platformapi/jdshopapi/store_page_test.go @@ -59,9 +59,10 @@ func Test11(t *testing.T) { func TestAllOrders(t *testing.T) { result, err := api.AllOrders(&AllOrdersParam{ - Current: 1, - PageSize: 1, - OrderID: "118793082128", + Current: 1, + PageSize: 10, + OrderCreateDateRange: []string{"2021-04-05 00:00:00", "2021-04-06 23:59:59"}, + // OrderID: "118793082128", }) if err != nil { t.Fatal(err) diff --git a/utils/routinepool/routinepool.go b/utils/routinepool/routinepool.go index f2c399b9..4e75f7e0 100644 --- a/utils/routinepool/routinepool.go +++ b/utils/routinepool/routinepool.go @@ -6,13 +6,14 @@ import ( "fmt" "runtime/debug" + "git.rosy.net.cn/baseapi" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/baseapi/utils" ) const ( - chanPoolSize = 8 + chanPoolSize = 20 ) type TaskParam struct { @@ -61,7 +62,7 @@ func callHandler(handler func()) (retVal interface{}) { func taskFun(taskChan chan *TaskParam, index int) { for { taskParam := <-taskChan - // baseapi.SugarLogger.Debugf("routine:%d, handle task:%v", index, taskParam.handler) + baseapi.SugarLogger.Debugf("routine:%d, handle task:%v", index, taskParam.handler) result := callHandler(taskParam.handler) if taskParam.resultChan != nil { taskParam.resultChan <- result