diff --git a/platformapi/ejyapi/ejyapi.go b/platformapi/ejyapi/ejyapi.go index 264407dd..eef151b2 100644 --- a/platformapi/ejyapi/ejyapi.go +++ b/platformapi/ejyapi/ejyapi.go @@ -137,3 +137,43 @@ func (a *API) GetStationList() (getStationListResult []*GetStationListResult, er } return getStationListResult, err } + +type GetUserOrdersResult struct { + ConsumeTimes string `json:"consumeTimes"` + AllPaysum string `json:"allPaysum"` + SaveMoney string `json:"saveMoney"` + OrderList []struct { + Orderld string `json:"orderld"` + StationName string `json:"stationName"` + StationPic string `json:"stationPic"` + PayTime string `json:"payTime"` + Ordersum string `json:"ordersum"` + Reducesum string `json:"reducesum"` + Orderstate int `json:"orderstate"` + HasstationPhone int `json:"hasstationPhone"` + StationPhone string `json:"stationPhone"` + } `json:"orderList"` + OrderQuantity int `json:"orderQuantity"` + CurrentPageNum int `json:"currentPageNum"` + AllPageNum int `json:"allPageNum"` + PersonalInfo struct { + JoinEjiayouDay string `json:"joinEjiayouDay"` + Headurl string `json:"headurl"` + NickName string `json:"nickName"` + CenterPicURL string `json:"centerPicUrl"` + GlobalPicURL string `json:"globalPicUrl"` + } `json:"personalInfo"` +} + +//获取用户个人订单 +func (a *API) GetUserOrders(userPhone string, page int) (getUserOrdersResult *GetUserOrdersResult, err error) { + params := make(map[string]interface{}) + params["stationIds"] = "" + params["page"] = page + sign := a.signParam(params) + result, err := a.AccessAPI("oreo/ejiayou_open_api/orders/histroy/"+userPhone+"/"+a.platformName+"/"+sign+"/"+utils.Int64ToStr(a.timeStamp), Url, params, true) + if err == nil { + utils.Map2StructByJson(result["data"], &getUserOrdersResult, false) + } + return getUserOrdersResult, err +} diff --git a/platformapi/ejyapi/ejyapi_test.go b/platformapi/ejyapi/ejyapi_test.go index 6b1da818..05f53c06 100644 --- a/platformapi/ejyapi/ejyapi_test.go +++ b/platformapi/ejyapi/ejyapi_test.go @@ -18,6 +18,7 @@ func init() { logger, _ := zap.NewDevelopment() sugarLogger = logger.Sugar() baseapi.Init(sugarLogger) + // api = New("1Zbve", "ymsrrxlZXlmglK6Q", "MYsFZGgwwprIahzQ") api = New("1Zbve", "htvse3XEDhBnCTNo", "QM5RnGl6kNh3ENLT") api.SetTimestamp(time.Now().Unix()) } @@ -29,3 +30,11 @@ func TestGetStationList(t *testing.T) { } t.Log(utils.Format4Output(result, false)) } + +func TestGetUserOrders(t *testing.T) { + result, err := api.GetUserOrders("18980410281", 1) + if err != nil { + t.Fatal(err) + } + t.Log(utils.Format4Output(result, false)) +} diff --git a/platformapi/jdshopapi/jxshopapi_test.go b/platformapi/jdshopapi/jxshopapi_test.go index 288aa221..c17ea1f8 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; 3AB9D23F7A4B3C9B=AK36FFYF5J6WMPRH7YTXMEX4CATHR6NAA3IQEESU2I33FEJRQ3DRLU4SZJYD2XGFLCFW43DHYP5HQKOMR4EFQSLKLA; 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; pinId=WMIzMhF5BfI9awOQjAcbdQ; pin=shop_jxcs2020; unick=shop_jxcs2020; _tp=VqmxIvk3BVEJnO6UciQrRA%3D%3D; _pst=shop_jxcs2020; TrackID=1zU-jV4M9HOHuGRY70cfi1uBCBqURV0p-wMJqussC2PZBGAsnk6rdCmca_eLWXNovoIyOGcKLzZLZ1GOzH1DP2I7H9-gVilaUAjruY91x7jY; ceshi3.com=000; AESKEY=56A094625C3C1022; QRCodeKEY=B1C8E87AC764F8C4577B84A40DF4299880BEDADA1BE1B5F6484360EE1F993DB6D3638318F9CEA5CD2B05302F582130E7; UIDKEY=17545176614065104; _vender_new_=GI63BGTJFDBQ4KTM333PMOGFGXGN2MWJNA4WUIW4ZGGIVOLTPK5TRV2UVRGJOLSZFF5XPPV376V2IZYUUTIZYUOSJ7XLQQXULY7UZCFHNUYZEPA5K4NKJ62CC6Q756VRE47INBENIPCNYN4MUZRCB27NNIDWST32H7A66G2G3UMJWUPPXMHKRJ4I6UJ43SNLTY755O3QKSMGQHPHSOAKK5R74V6PBVCLI56OPZPR7RNFOAEYFZTP2BSCS5ZMNTWN4HIOX5NUKDT5E75AVXNKX43RBTJ6W255CTVTEQ67VYYOGAEFV3CBL4MM5MFU6T2V7DWAKVLHWY2IK72YOJU4FK5DKJQLQ3COKGR7DKIPROZVBC6JXTOPRXGVJKSRURJWMC4GYTSRUPY2SD4LWNIIXSN43R4BBC6T7IT4RBGRQHU63BU24NLT3B722WUBKZ7XZVGJA3N5V5QQZAJ27O3QLTP5M5YE6OWLQPEH5LY76SIQJO62K63LPG6XGQM4I32SFFJR3R5NLQZPFLJTI6K74ICYFOP5LP54YOAU3MF223TH7RBNDQKQZAJGFHE3CEO3PDGTDMTFA3LOKDRYE3RCNZ3IIQEQZ3EKQ7Y7EZPHVW2EPN7W4FOKDTFUR4TGVDUV7OMCINCBJML5JOPCYGI5MC5MWE; _BELONG_CLIENT_=WPSC4XJXWK5USS4JNZY2X7VRLR5MCBKRSVHEXABGTHDGISIQK5YOLZUXYE7IOIM7MOKO74H6CRN6WHAAR4TMDV3XZWMXZRCRT5XRNE3V356BTOB2Y7LPK66VWQK6HPTGWVXIDXDCPVE3W5WMHAIO6AT2LX2XXVNUCXR34ZWFK6HY45CORGIKOSYDYZBF27WOKTUX6BS4FZMIJWNUX6CB4JAA25ZLF7ZEKYOO4QV5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BMTUJZACIBHXQFAVLRF76VQY5PNJGGJNBEZHSFYYJA3YORRT7FB5AHCOIFQKF3W5RWNUX6CB4JAA26JNMO7AYWNUPZF5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BWZDKMOJ5BS6II53ERY6ALV3ZWPF42L4CPUHEGPYIII35KDC4FCNVCORCXFD6IVNLBEDPB2GGP4UHWNRUDOQBDIW7RZJXBA2WV5ANZOTEGUCDWYRVQS2YUTIZNZ276PRYG4N56V6YTII7MBKBC7LYHO7C555HTSBXGNRM3E466AYN67DHWVM5HQFJ4NFDO5BSX66ONTTZQVJ7BKR3BEBVGJCJNQ; _vender_=TNK3O6PALVQGHZYSSOH7L4PZFXD2QEMYMFRFF57TELYN4LQLXSPDPQTS2T6DT6Z4LTZEYTMS64FSPW7AO5OSVPCC5UXA5236RRQGSDMMFKYN22HBLPNNNDJ7EQS5NOGALMTLVOQSEBKX4EOVORRD6L536ICPREWPSW6NKQ6V7YP2SC4RQRZVV5L75KYETGWV25ORZ3W5RHKJSP5KHTC62KEHJ47UBOYHQXIXUN5UZ7GEPNC7TTKSCXDHWDFESR5SRKTXITQEBPR3XE3UWSWVOJOKCMSABZJ744URIU5DZHQGTTOSIIB2TWTEHPHQGKVR2KY2YIRYYKXHFV3O2EXPOYB4DVGHJNC24ZWEJW3TBR4STR3FX3WDJKATQGW6ZT5VZYD6MZOT7I46XBLKRWCRQWNBMQKR4MJHRULBANWCPK2DOUEDOEHNFKSHACSQCVL623V2JMFUZMOJCWZIS6YK4NPFDV2YMBQG7EPFVAOEWNELCU55YP5A; b-sec=S2JWP6CAFP7K4UQHUODGXYT4BTSHR25YQUFIV6WEFNUTVWLNHZ3Z7BQPAYPGWDXC4YNET5YWTDQ62; thor=5E1D1AE7BBC42FACA3496D9C54AF9F879CF4836860E75FF70BFCDEAC5A75C1C5242253DE29DBBC23D28D96B1640DEEA0AE103FFC31EFDB77740DDFF2F939C6B831D17E12E2FC06D7F3F2362B339A0C681611A0F3FE4DBD790C9E72FC904940E09B2E63E5BAD4C63F61155366693E03C5605B89FF0C6C9FA22C4380780ABE21CAAB514A1B0C91E199C940617343D4154C; __jda=220467782.1591327001141529223150.1591327001.1606889796.1606956923.73; __jdb=220467782.11.1591327001141529223150|73.1606956923; __jdc=220467782; _base_=YKH2KDFHMOZBLCUV7NSRBWQUJPBI7JIMU5R3EFJ5UDHJ5LCU7R2NILKK5UJ6GLA2RGYT464UKXAI4Z6HPCTN4UQM3WHVQ4ENFP57OC2NCIWTST4KDNCWZES6EV2TD5XDTCNE6YVKRXISVWNQHZDBO6QEKYXMXGPYGVEOCQCSG4SOQWCP5WPWO6EFS7HEHMRWVKBRVHB33TFD4AUHV3TOJD7MGBX53BNNP2E6MSSOORYGL5H2GYFRURR5ACFJ54GH7PTHFL22YL3C6ODFYFTWGV5UAWCX5C6J372TDCL6LDNEERERTGCSHIL2CHYGNQWN2BRPVMNREL25HVQAQIWW3S2YBFMIMTF6SWAFAQ52UF5TATP7KZIQ + 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 `) // api.SetCookie("thor", "5E1D1AE7BBC42FACA3496D9C54AF9F879CF4836860E75FF70BFCDEAC5A75C1C5E43030CF54E4A3A8F5E760492948E69B763D115FE234A59948BA538A4F7E18F38B80F818E28EAE71F1CF5BFE2D0DC456D56E8BEAEF10D398C709D9A4EB46923C7E63867435BD42996F1570A816FD1B0B247CD9756A1184DD61317D28BBF77F828691684AD6E60801B2BB38F9DE086D73") diff --git a/platformapi/jdshopapi/store_page_test.go b/platformapi/jdshopapi/store_page_test.go index 218f5378..3761ee3d 100644 --- a/platformapi/jdshopapi/store_page_test.go +++ b/platformapi/jdshopapi/store_page_test.go @@ -174,34 +174,35 @@ func TestSubmitBasic(t *testing.T) { } func TestUpdateBasic(t *testing.T) { - err := api.UpdateBasic(&UpdateBasicParam{ - StoreID: 24562992, - StoreName: "京西菜市温江旗舰生鲜店", - CategoryID2: 62, - Coordinate: "30.692941,103.858781", - BussinessBeginTime: "08:30", - BussinessEndTime: "20:00", - ImgURL: "jfs/t1/141918/10/14803/148865/5fb4e8cbE95a606cb/08a8dc277eb97a16.png", - StorePhone: "13706546496", - AddName: "四川成都市温江区@!温江区锦泉街116号（优取舍）", - AddCode1: 22, - AddCode2: 1930, - AddCode3: 49315, - CategoryID1: 34, - QualificationRequests: []*QualificationRequests{ - &QualificationRequests{ - QualificationID: 41, - QualificationName: "营业执照", - QualificationNo: "11111", - QualificationURL: "jfs/t1/148622/37/14846/10266/5fb4e3e2Ef2f61870/a7cfba9c1513d95e.png", - StartTime: "2020-11-04 00:00:00", - EndingTime: "2020-11-06 23:59:59", - Time: []string{"2020-11-04 00:00:00", "2020-11-06 23:59:59"}, + shop, _ := api.ShopList(1) + for _, v := range shop.List { + detail, _ := api.ShopDetail(v.StoreID) + api.UpdateBasic(&UpdateBasicParam{ + StoreID: detail.StoreID, + StoreName: detail.StoreName, + CategoryID2: 62, + Coordinate: detail.Coordinate, + BussinessBeginTime: detail.BussinessBeginTime, + BussinessEndTime: detail.BussinessEndTime, + ImgURL: detail.ImgURL, + StorePhone: detail.StorePhone, + AddName: utils.LimitUTF8StringLen(detail.AddName, 100), + AddCode1: detail.AddCode1, + AddCode2: detail.AddCode2, + AddCode3: detail.AddCode3, + CategoryID1: 34, + QualificationRequests: []*QualificationRequests{ + &QualificationRequests{ + QualificationID: 41, + QualificationName: "营业执照", + QualificationNo: "91510106MA62QYUK9X", + QualificationURL: "jfs/t1/140863/13/17145/275844/5fc9ac7aE9a5f8d68/f9d459176d463cb5.jpg", + StartTime: "2017-03-01 00:00:00", + EndingTime: "2027-03-01 00:00:00", + Time: []string{"2017-03-01 00:00:00", "2027-03-01 00:00:00"}, + }, }, - }, - }) - if err != nil { - t.Fatal(err) + }) } // t.Log(utils.Format4Output(result, false)) } diff --git a/platformapi/jdshopapi/store_test.go b/platformapi/jdshopapi/store_test.go index 8097fd4d..f1734213 100644 --- a/platformapi/jdshopapi/store_test.go +++ b/platformapi/jdshopapi/store_test.go @@ -32,7 +32,7 @@ func TestCreateEntityStore(t *testing.T) { } func TestDeleteStoresByID(t *testing.T) { - err := api.DeleteStoresByID(1000068955) + err := api.DeleteStoresByID(1000063844) if err != nil { t.Fatal(err) }