From 72b3ba5d222f6e71526def4145b1f66903f45e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 10 Jan 2023 16:26:22 +0800 Subject: [PATCH] 1' --- platformapi/jdapi/jdapi_test.go | 9 ++-- platformapi/jdapi/store_page.go | 50 +++++++++++++++++++ platformapi/jdapi/store_page_test.go | 40 ++++++++++++--- .../tiktok_shop/tiktok_api/sku_delete_test.go | 15 ------ 4 files changed, 85 insertions(+), 29 deletions(-) diff --git a/platformapi/jdapi/jdapi_test.go b/platformapi/jdapi/jdapi_test.go index cabbf529..3b4e96f3 100644 --- a/platformapi/jdapi/jdapi_test.go +++ b/platformapi/jdapi/jdapi_test.go @@ -29,9 +29,9 @@ func init() { // 天天果园 //api = New("c45e6510-00ba-4be2-977e-bcb9c9792cc7", "5d5577a2506f41b8b4ec520ba83490f5", "0b01b9eeb15b41dab1c3d05d95c17a26") // 京东果园 - //api = New("b1138139-9610-4b80-9a63-a63da4773885", "5d5577a2506f41b8b4ec520ba83490f5", "0b01b9eeb15b41dab1c3d05d95c17a26") + api = New("b1138139-9610-4b80-9a63-a63da4773885", "5d5577a2506f41b8b4ec520ba83490f5", "0b01b9eeb15b41dab1c3d05d95c17a26") // 果切 - api = New("0e12f461-2e6b-49ca-bce6-935c6672362d", "f2ed33075faf4773a47e065acd79532b", "aed14cbbecac4456843570e90c5f46ec") + //api = New("0e12f461-2e6b-49ca-bce6-935c6672362d", "f2ed33075faf4773a47e065acd79532b", "aed14cbbecac4456843570e90c5f46ec") //prod zs // api = New("6f8d3290-0120-4ad7-8b53-943c67c84f3f", "789279b9ae814ba091ac52815566b54d", "5d668cd227644637bb0fd73ed8118ec8") @@ -39,10 +39,7 @@ func init() { //const cookieValue = "OPJQMA7B3FTKCAUGO7FHCH5NMBGAWGGXYRNLEHYYZNGNPNIBCAM4IOEPG3NT3RIA44G5C3535Q5LGG4F4SR4AZVLGYKYTKFJJKEAOXENVBL5VXNILRP3GLNVVWA26XZ3VGSYOHA72RICMVZS3G53DTEH3JWVXCZBKYQN5CW57OZAUUGW26BM5GBMDUKCPJGLYBMEIVPIGG6PY2HOZTQL5PWKCSDJLG7AKSLKUQ422BVJDNQ36DIA74FV7RFQMMQPNJ5YQMCG2M72IH43LZDVSAYZWKUGAVD7VFRMEYTOXYHWCYVDXJ6HYFIPWIN3ULLXDDLN2ICON4GRK" //api.SetJdCookie(cookieValue) //api.SetCookie("user", "VCQUVHVJI4ELNGFZOYMCDYDUSHEJMPXZRZXSNBRB4MVBNENP72REAAZR3R4SGDJ5ZI4FLYLLN5EGBBMTFCWHZVESIWBNLKZPLHWD6UIBTPXOF5IXM6AVA3V6TUNZD5UJS43AROJ2IRPZWEN5AGZYBUEGD2EWFHHT3AOYXZYY4Q2OLWFTVITE5NEOXZXC5NSQWCV6NZG4LREQ6W2UVRSYWKL4Y6X7FXYIKJXSBSCOJ5OVVBPYJL4VDJUHW3P6D73BS6HG6MBXGIW576I6LGDTS6QISBWMZ4QZKVKOUHWBVIEMWKUWC6B6WPMKTCCKNRJ5MDOXFCWFFRK3ET3YXVE3ATQCURQ67HGQGUZFPZ46FQDYCONJQX6ZPVAQSQPDVL3HDBIIYIYDMWKFWXVFNA7BVVYJ34ADKDSEDLEEF5B2PIQZFLSUSODQ") - api.SetCookieWithStr(` -__jdu=16193999982702078345144; shshshfpa=972f47df-9252-dc1a-1d6d-40594ce0501b-1619400562; webp=1; visitkey=44137284214309276; shshshfp=4d574741223da61a369c18ce2febefe8; shshshfpb=msX4%202n384blCOGusOxGDvQ%3D%3D; __jdv=56585130|direct|-|none|-|1627614638176; 3AB9D23F7A4B3C9B=CKENC5MAUU744ZQDKVRY2L7UIJ23PJRDYJ6HF3ZMQHC5FFD46FMUQXRINFCOC4SKHL5MU3PPNPP4C4AX5ZYBXJ7LZ4; TrackID=1femwSKOdp1ZzCAkdhpWTj9ATGHidr0CVcCithI7AEGRK1cZPjUr9LVSxehF9p_sHd3C4-XX0yG8ADNSGO2mrSqzK8N-Mp-qvsZJtJ_Gs0fM; pinId=WMIzMhF5BfL6nJp9AcA2-A; pin=shop_jxcs; unick=shop_jxcs; _tp=7FBEvLyPe%2FKcgxsfY5lRgA%3D%3D; _pst=shop_jxcs; __jda=178324346.16193999982702078345144.1619399998.1626742886.1626836024.21; _base_=YKH2KDFHMOZBLCUV7NSRBWQUJPBI7JIMU5R3EFJ5UDHJ5LCU7R2NILKK5UJ6GLA2RGYT464UKXAI4Z6HPCTN4UQM3WHVQ4ENFP57OC2DC7JQLRXRUO5PW6B77O6UXAZ4TCNE6YVKRXISVLBYGYO44RCDDPWDA4AEL7ZLXI2SG4SOQWCP5WP7WCU6EEVB3X4MRGYT464UKXAI4Z6HPCTN4UQM3WHVQ4ENFP57OC5EOOW2LAU4UK4CTFKSSDIO3UTAUWFCLQ6J2UOK5QDCUPF4QE5PIIEQQIBQB5VLHO5UXUJUYNHMOKTCP5MGOZZAC3LW2CWZF5OZUQIZ4RZVRVUDUOCEN6UHBMHZMUVYLLKQCM45KR2VB7VA3RQRJOWOI2FUJVU7I4DYZIJ35BUTKY3K2VH7MZR5DMCBEYTQUHFGRGW75NOZOSGTQZOBM5RVPNAFQV7IXSO76UYYS7SY3JBEJEMZQXYFXJUFHDXEA6T5YIR72JPV7525MAECFVW4WWAJLCDEZPUVQBIEGRJVND46GK4SWI; jdO2OOpenPortalSessionId=5A221F433BF9714293622C77194B5145.s1; token=3e96a739074e44d6988d97e5bfa92238; JSESSIONID=21DEFFB68096367157F4A95F70A80688.s1 - - `) + api.SetCookieWithStr(`user_email=jd_jxcsbjk1524; store_deviceid=241ad81f5e12e3b5b7a9e4c17679af3b; store_session=%231672217347215; 3AB9D23F7A4B3C9B=46LSX42G3BAGZRE6LV6YU7PSHEXXBHWA2XAQE6BURIQZJAX5LD2ZRVPX4TTYBDXYC2OAG4ULHATKYUGI6QOFLGSELE; josl-privilege1.jddj.com=Y636M7QUOPPH4QLOVU6JOUNGDHIEJV5CWKMQ743LVDPNW6TN4TYFFV4XOXKLERC2UXFT44TMCUMRFMMWOJ7BV6P3FECMT2ZVQQEK6DMCX33SS54V4AHXHO2APRYZGCBIPYXPP6LCRVUFA3GCF3XHLTKSAJ6XLEXWSYHUOPL7SSAJ42JRU5HMK4F6DP3B5GZRK3LVCD6ENYFBU23UOS72NJIPZGJ34FPMT3SWBKOGHVPHP67PNOJ57CP7SFDYOYSAWJZF7JJZT4VN7T7TLSA26VCHLIZNTCU35RZYOAAM2YSIELTLJFD6CXLK3HAJ44XVC6YPBQ3OEKZJ24L7R23TYZA5JMSPJU7HE6MGAWXAMIJ7H54ZWWGP56KATLF26DHPBFC7H6AGN62RYAH3GOOTQMZPFOOK3A5M4RSJGLYDIG2YB3HH35HA; o2o-stock1.jddj.com=Y636M7QUOPPH4QLOVU6JOUNGDHIEJV5CWKMQ743LVDPNW6TN4TYFFV4XOXKLERC2UXFT44TMCUMRFMMWOJ7BV6P3FECMT2ZVQQEK6DMCX33SS54V4AHXHO2APRYZGCBIPYXPP6LCRVUFA3GCF3XHLTKSAJ2F2AMBZVLNMABCVYM2LN6EAITUT5JB5T2BPLJ3LEDBFP75RTQR6X42EILFXMWIA57Z26TA3Z672T5JS2PVBZCSMSBXBXIJ6YFLJLKPKZZIBEYR7NYPZKZL7G3LPDUFJYLK3U2ZZYDOTSMLZTIBWTANQFATSGBMBECSGXND2QXF354HHCDLZKCBZ7GLYYWZR74LI6PCF6CGPBQ; o2o-pms1.jddj.com=Y636M7QUOPPH4QLOVU6JOUNGDHIEJV5CWKMQ743LVDPNW6TN4TYFFV4XOXKLERC2UXFT44TMCUMRFMMWOJ7BV6P3FECMT2ZVQQEK6DMCX33SS54V4AHXHO2APRYZGCBIPYXPP6LCRVUFA3GCF3XHLTKSAJ2F2AMBZVLNMABCVYM2LN6EAIT7G5XMTXYHYOIAXGLFL5FAJSQVOB7UF6SSUQLTUBQW7SB4BD5AREVJS2PVBZCSMSBXBXIJ6YFLJLKPSHZBQN5H3C4TCLUKVQGVYJFI7A; user_key=740812; vender_id=379599; vender_name=\u4EAC\u897F\u679C\u5207; shop.o2o.jd.com1=Y636M7QUOPPH4QLOVU6JOUNGDHIEJV5CWKMQ743LVDPNW6TN4TYFFV4XOXKLERC2UXFT44TMCUMRFMMWOJ7BV6P3FECMT2ZVQQEK6DMCX33SS54V4AHXHO2APRYZGCBIPYXPP6LCRVUFA3GCF3XHLTKSAKINWFTZ4LD3BYM23ELADBGKCC47HILWKM7BNBUEPVVQEVABWBMUBPAXIFKB2WDCEK56RTBOHEBYVN6GHVPHP67PNOJ57CP7SFDYOYSATTQ4MQJCQQP2E6K3QQUQ3JKQFGBCTCPUXLJ4TNFFSLMV6UQQKZMWHG4UK2LPOIXJYX35PXSETJRYOTV6JFGFFAOVGHSCOOPQYIZ4BZEEBIDH5HRXX7MQNO55XN2SMAXUPVUKXVBWMNPYGDEBVKAKJM7EMI; lsp-store1.jddj.com=Y636M7QUOPPH4QLOVU6JOUNGDHIEJV5CWKMQ743LVDPNW6TN4TYFFV4XOXKLERC2UXFT44TMCUMRFMMWOJ7BV6P3FECMT2ZVQQEK6DMCX33SS54V4AHXHO2APRYZGCBIPYXPP6LCRVUFA3GCF3XHLTKSAKINWFTZ4LD3BYM23ELADBGKCC47HILWKM7BNBUEPVVQEVABWBMUBPAXIFKB2WDCEK56RTBOHEBYVN6GHVPHP67PNOJ57CP7SFDYOYSATTQ4MQJCQQP2E6K3QQUQ3JKQFGBCTCPUXLJ4TNFFSLMV6UQQKZMWHG4UK2LPOIXJYX35PXSETJRYOTV6JFGFFAOVGHSCOOPQYIZ4BZEEBIDH5HRXX7MQNO55XN2SMAXUPVUKXVBWMNPYGDEBVKAKJM7EMI`) } func TestTest(t *testing.T) { diff --git a/platformapi/jdapi/store_page.go b/platformapi/jdapi/store_page.go index c8a83d4b..e431fb5c 100644 --- a/platformapi/jdapi/store_page.go +++ b/platformapi/jdapi/store_page.go @@ -100,6 +100,39 @@ type CorporationInfo struct { } `json:"employees"` } +type GetOrderDetailByLicenseImg struct { + Id interface{} `json:"id"` + ApprovalId interface{} `json:"approvalId"` + StationNo interface{} `json:"stationNo"` + VenderId interface{} `json:"venderId"` + QualifyUrl interface{} `json:"qualifyUrl"` + QualifyType int `json:"qualifyType"` + QualifyName string `json:"qualifyName"` + QualifyExpireStart interface{} `json:"qualifyExpireStart"` + QualifyExpireEnd interface{} `json:"qualifyExpireEnd"` + QualifyExpireForever int `json:"qualifyExpireForever"` + QualifyOwner interface{} `json:"qualifyOwner"` + QualifyNumber string `json:"qualifyNumber"` + QualifyAddress string `json:"qualifyAddress"` + CreatePin interface{} `json:"createPin"` + CreateTime interface{} `json:"createTime"` + QualifyPin interface{} `json:"qualifyPin"` + QualifyTime interface{} `json:"qualifyTime"` + Yn interface{} `json:"yn"` + Type interface{} `json:"type"` + LicenceType interface{} `json:"licenceType"` + LicenceName string `json:"licenceName"` + EconKind string `json:"econKind"` + FirmStatus interface{} `json:"firmStatus"` + Scope string `json:"scope"` + QualifyIdList interface{} `json:"qualifyIdList"` + NeedQualifyFlag int `json:"needQualifyFlag"` + QualifyExpireStartForWeb string `json:"qualifyExpireStartForWeb"` + QualifyExpireEndForWeb interface{} `json:"qualifyExpireEndForWeb"` + QualifyNumberList interface{} `json:"qualifyNumberList"` + StationNoList interface{} `json:"stationNoList"` +} + type PageShopInfo struct { DisCatName string `json:"disCatName"` DisplayType string `json:"displayType"` @@ -745,6 +778,7 @@ func (a *API) GetStoreList(lng string, lat string) (retVal map[string]interface{ return retVal, err } +//GetCorporationInfo 根据社会信用编码获取门店的详情(失效) func (a *API) GetCorporationInfo(stationNo, qualifyNumber string) (corporatonInfo *CorporationInfo, err error) { result, err := a.AccessStorePage("https://sta-store.jddj.com/store/requestQualify.o2o", map[string]interface{}{ "stationNo": stationNo, @@ -756,6 +790,22 @@ func (a *API) GetCorporationInfo(stationNo, qualifyNumber string) (corporatonInf return corporatonInfo, err } +//GetCorporationInfo2 京东根据门店营业执照获取门店信息 +func (a *API) GetCorporationInfo2(picUrl string) (data *GetOrderDetailByLicenseImg, err error) { + result, err := a.AccessStorePage("https://store.jddj.com/client", map[string]interface{}{ + "appName": "scpc", + "functionId": "storeQualifyNew/getLencenByOcr", + "body": fmt.Sprintf(`{"stationNo":%s,"picUrl":"%s"}`, utils.Int64ToStr(time.Now().Unix()), picUrl), + }, true) + + if err != nil { + return nil, err + } + if err := utils.Map2StructByJson(result, &data, false); err != nil { + return nil, err + } + return +} func MonthSaleNum2Int(monthSaleNumStr string) (monthSaleNum int) { searchResult := monthSaleNumReg.FindStringSubmatch(monthSaleNumStr) if searchResult != nil && len(searchResult[1]) > 0 && len(searchResult[2]) > 0 { diff --git a/platformapi/jdapi/store_page_test.go b/platformapi/jdapi/store_page_test.go index a582838e..6068568e 100644 --- a/platformapi/jdapi/store_page_test.go +++ b/platformapi/jdapi/store_page_test.go @@ -1,5 +1,11 @@ package jdapi +import ( + "git.rosy.net.cn/baseapi" + "git.rosy.net.cn/baseapi/utils" + "testing" +) + // //import ( // "fmt" @@ -65,14 +71,32 @@ package jdapi // baseapi.SugarLogger.Debug(utils.Format4Output(imgList, false)) //} // -//func TestGetCorporationInfo(t *testing.T) { -// imgList, err := api.GetCorporationInfo("", "92330104MA28XPXH5G") -// if err != nil { -// t.Fatal(err) -// } -// baseapi.SugarLogger.Debug(utils.Format4Output(imgList, false)) -//} -// +func TestGetCorporationInfo(t *testing.T) { + imgList, err := api.GetCorporationInfo("11734851", "92331002MA2AMYKG0B") + if err != nil { + t.Fatal(err) + } + baseapi.SugarLogger.Debug(utils.Format4Output(imgList, false)) +} + +func TestStoreUploadImgByURL(t *testing.T) { + a := `http://img30.360buyimg.com/vendersettle/jfs/t1/97061/15/29750/159958/63bd13ebF6895c732/bdbe6d273b92a187.jpg` + result, err := api.StoreUploadImgByURL(a) + if err != nil { + t.Fatal(err) + } + baseapi.SugarLogger.Debug(utils.Format4Output(result, false)) +} + +func TestGetCorporationInfo2(t *testing.T) { + a := `http://img30.360buyimg.com/vendersettle/jfs/t1/97061/15/29750/159958/63bd13ebF6895c732/bdbe6d273b92a187.jpg` + imgList, err := api.GetCorporationInfo2(a) + if err != nil { + t.Fatal(err) + } + baseapi.SugarLogger.Debug(utils.Format4Output(imgList, false)) +} + //func TestGetStoreList(t *testing.T) { // result, err := api.GetStoreList("104.054195", "30.581782") // if err != nil { diff --git a/platformapi/tiktok_shop/tiktok_api/sku_delete_test.go b/platformapi/tiktok_shop/tiktok_api/sku_delete_test.go index c61eb4d9..2a7b0de0 100644 --- a/platformapi/tiktok_shop/tiktok_api/sku_delete_test.go +++ b/platformapi/tiktok_shop/tiktok_api/sku_delete_test.go @@ -17,21 +17,6 @@ func TestCreateSubProduct(t *testing.T) { fmt.Println(obj) } -// strAndObjAddPairs必须按字符串1,转换地址1，字符串2，转换地址2这样的格式传递 -func Strings2Objs(strAndObjAddPairs ...interface{}) (err error) { - str := "" - for k, v := range strAndObjAddPairs { - if k%2 == 0 { - str, _ = v.(string) - } else if str != "" { - if err = utils.UnmarshalUseNumber([]byte(str), v); err != nil { - return err - } - } - } - return nil -} - // 删除已经创建商品,重新同步 func TestDeleteSkuAndUploadSku2(t *testing.T) { var errList = make([]error, 0, 0)