From a472b60ae0b4abde215765acebe7b2fd46ea0046 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, 13 Apr 2021 15:52:33 +0800 Subject: [PATCH] aa --- platformapi/jdapi/jdapi_test.go | 10 +++++----- platformapi/jdapi/store_page.go | 4 +--- platformapi/jdapi/store_page_test.go | 2 +- platformapi/jdshopapi/store_page_test.go | 7 +++++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/platformapi/jdapi/jdapi_test.go b/platformapi/jdapi/jdapi_test.go index 24e0705f..ed15ac3a 100644 --- a/platformapi/jdapi/jdapi_test.go +++ b/platformapi/jdapi/jdapi_test.go @@ -23,16 +23,16 @@ func init() { // sandbox // api = New("594ab45a-9a73-4a43-82b0-a64cbd55d883", "06692746f7224695ad4788ce340bc854", "d6b42a35a7414a5490d811654d745c84") // prod - api = New("29afd5a8-f93f-4d4c-9fce-a7297340af59", "1dba76d40cac446ca500c0391a0b6c9d", "a88d031a1e7b462cb1579f12e97fe7f4") + // api = New("29afd5a8-f93f-4d4c-9fce-a7297340af59", "1dba76d40cac446ca500c0391a0b6c9d", "a88d031a1e7b462cb1579f12e97fe7f4") // 天天果园 - // api = New("c45e6510-00ba-4be2-977e-bcb9c9792cc7", "5d5577a2506f41b8b4ec520ba83490f5", "0b01b9eeb15b41dab1c3d05d95c17a26") + api = New("c45e6510-00ba-4be2-977e-bcb9c9792cc7", "5d5577a2506f41b8b4ec520ba83490f5", "0b01b9eeb15b41dab1c3d05d95c17a26") //prod zs // api = New("6f8d3290-0120-4ad7-8b53-943c67c84f3f", "789279b9ae814ba091ac52815566b54d", "5d668cd227644637bb0fd73ed8118ec8") // const cookieValue = "YYJV3NHVBPHLD36FWP6F3EM5PTXJ2XZQS7U4HWRIDPP4IWGUKUIB4XG5N26CZRDLDF7PKOXBPD6BNTUAJLETLZOIWMCVFI3K6MYZIY4QBIXIMXYDJNUKFGJVQTN5356SAD6WPCIHWNQAG7DDMF7L7S3SHCT3RM3CQG7IJIPUQ3THS5UIUYWMKINM7ETUOQB7OBPOPZVCT3ZJY55243TDVXLO25PP4UYSPTTPMNQ7HPMWOJKJ3BJWGVHD243MXH7NZWW264TKN5UOCJBSSSOKD2QQII" - const cookieValue = "111" - api.SetJdCookie(cookieValue) - // api.SetCookie("user", "VCQUVHVJI4ELNGFZOYMCDYDUSHEJMPXZRZXSNBRB4MVBNENP72REAAZR3R4SGDJ5ZI4FLYLLN5EGBBMTFCWHZVESIWBNLKZPLHWD6UIBTPXOF5IXM6AVA3V6TUNZD5UJS43AROJ2IRPZWEN5AGZYBUEGD3MSKKBKBSRP3DSEQXLITYNBLFZCHXCA7L4KGOSJRMM7R5IQP7QGLGRQB27AOE4YMLRJ3UPTZADPWJOYB3UZ7UZHLBVZRREEX647O3WQUU4BYXUOFZPIPRR77W3PQV543E") + // const cookieValue = "GXBMZPW62YXDDG4NE5JDLJJJHWWGJFKML56GHPDEUP6E65UMM4MQ2OB3RYHSEGXGEP5RT55TQZ3PJEXQVYJSNEBNZVY76BZPTRJTZTTZEEJRFHJ4JM5NZ6XI3TEG3X54QBIFC4C5WZUMEN6XHATZBIGB4XKWNNCAAVX4SNS5EIQTQBALUVFPM52OJ3X6L4MONINJDVRVL2UGV6BUPHOMBUWCNPP3AAKAQAXGI3DJA6LUXWO32ILD6E5QHFYGLC6SFRTUQPAUJJXGSGIIZBICUOPVZ7HJW4XPEJFBZU5TAEXOOWKXSK6RWKS6ABQGWC5SHKC73UFVR3WYW3XI5UUIUVWHXTFH6VNYCS4BV5Q" + // api.SetJdCookie(cookieValue) + api.SetCookie("user", "GXBMZPW62YXDDG4NE5JDLJJJHWWGJFKML56GHPDEUP6E65UMM4MQ2OB3RYHSEGXGEP5RT55TQZ3PJEXQVYJSNEBNZVY76BZPTRJTZTTZEEJRFHJ4JM5NZ6XI3TEG3X54QBIFC4C5WZUMEN6XHATZBIGB4XKWNNCAAVX4SNS5EIQTQBALUVFPM52OJ3X6L4MONINJDVRVL2UGV6BUPHOMBUWCNPP3AAKAQAXGI3DJA6LUXWO32ILD6E5QHFYGLC6SFRTUQPAUJJXGSGIIZBICUOPVZ7HJW4XPEJFBZU5TAEXOOWKXSK6RWKS6ABQGWC5SHKC73UFVR3WYW3XI5UUIUVWHXTFH6VNYCS4BV5Q") // api.SetCookieWithStr(` // lsp-store1.jddj.com=OPJQMA7B3FTKCAUGO7FHCH5NMBGAWGGXYRNLEHYYZNGNPNIBCAM4IOEPG3NT3RIA44G5C3535Q5LGG4F4SR4AZVLGYKYTKFJJKEAOXENVBL5VXNILRP3GLNVVWA26XZ3VGSYOHA72RICMVZS3G53DTEH3IHCHDRX336R2EXWT7BJ2TYBVH4ZOIDJ3Z4S6CK6YZI2CJPY4ODPTEFER62CESGD6RKRRAYUQASOCANT6CNLQKGUGYTHYOVR7X7HP6VITNSCLX2WLDD26IXJIHPSYUWMUKUGAVD7VFRMEYTOXYHWCYVDXJ6HYFIPWIN3ULLXDDLN2ICON4GRK; store_deviceid=238a1e29ae9f0c2c060e1a68363919ab; jdO2OOpenPortalSessionId=FF99E5136A1AB127C4FF49AEC246DA77.s1; token=3a75e952e9fe48279c96dd8ebcf0fc5a; JSESSIONID=670146147B1EF59F0FCD7BF041BB1C93.s1 diff --git a/platformapi/jdapi/store_page.go b/platformapi/jdapi/store_page.go index 60d331c3..d2b29675 100644 --- a/platformapi/jdapi/store_page.go +++ b/platformapi/jdapi/store_page.go @@ -1095,7 +1095,6 @@ type GetJdShopOrdersResult struct { TieredCommissionInvoiceFee int `json:"tieredCommissionInvoiceFee"` OrderID int64 `json:"orderId"` Subsidy float64 `json:"subsidy"` - SettleStatus string `json:"settleStatus"` PaymentSubsidies float64 `json:"paymentSubsidies"` DeliveryTypeStr string `json:"deliveryTypeStr"` PackageBill float64 `json:"packageBill"` @@ -1109,7 +1108,6 @@ type GetJdShopOrdersResult struct { StationName string `json:"stationName"` Commission float64 `json:"commission"` ID int `json:"id"` - WithdrawID string `json:"withdrawId"` BusinessFinishTime int64 `json:"businessFinishTime"` StationID int `json:"stationId"` SettleOrderIDStr string `json:"settleOrderIdStr"` @@ -1120,7 +1118,7 @@ type GetJdShopOrdersResult struct { PickupServiceAmount float64 `json:"pickupServiceAmount"` RelationID int `json:"relationId"` GoodsBill float64 `json:"goodsBill"` - SettleOrderID int64 `json:"settleOrderId"` + SettleOrderID string `json:"settleOrderId"` MarketBill float64 `json:"marketBill"` StoreFreightAmount float64 `json:"storeFreightAmount"` BusinessStartTime int64 `json:"businessStartTime"` diff --git a/platformapi/jdapi/store_page_test.go b/platformapi/jdapi/store_page_test.go index 6ae570ec..c3b7f309 100644 --- a/platformapi/jdapi/store_page_test.go +++ b/platformapi/jdapi/store_page_test.go @@ -215,7 +215,7 @@ func TestUpdateClosetStatus(t *testing.T) { } func TestGetJdShopOrders(t *testing.T) { - result, err := api.GetJdShopOrders("20200903", "20200904", "320406", "jd_jxcs1223") + result, err := api.GetJdShopOrders("20210412", "20210413", "339032", "jd_jxgy") if err != nil { t.Fatal(err) } diff --git a/platformapi/jdshopapi/store_page_test.go b/platformapi/jdshopapi/store_page_test.go index 6b603cc5..3bd0ac52 100644 --- a/platformapi/jdshopapi/store_page_test.go +++ b/platformapi/jdshopapi/store_page_test.go @@ -9,6 +9,7 @@ import ( "math" "sort" "testing" + "time" "git.rosy.net.cn/baseapi/utils" ) @@ -103,8 +104,10 @@ func TestTryGetCookie(t *testing.T) { } func TestAAADS(t *testing.T) { - result := md5.Sum([]byte("2108663624000031|0")) //2108663624000031 - chanIndex := int(int64(binary.LittleEndian.Uint32(result[8:])) % int64(1000)) + now := time.Now().Unix() + fmt.Println(utils.Int64ToStr(now)) + result := md5.Sum([]byte("2108849168000062" + utils.Int64ToStr(now))) + chanIndex := int(int64(binary.LittleEndian.Uint32(result[8:])) % int64(2000)) fmt.Println(chanIndex) }