diff --git a/platformapi/ebaiapi/ebaiapi_test.go b/platformapi/ebaiapi/ebaiapi_test.go index 467decd2..ce86377b 100644 --- a/platformapi/ebaiapi/ebaiapi_test.go +++ b/platformapi/ebaiapi/ebaiapi_test.go @@ -29,13 +29,13 @@ func init() { // api = New("62289", "d3ec2358d6a819ea") // 京西菜市 - api = New("34665", "c3db75b754ea2d89") + //api = New("34665", "c3db75b754ea2d89") //菜市测试 // api = New("62923", "aa4cdc6c1108486b") // 京西果园 - //api = New("35957", "10013fbb7c2ddad7") + api = New("35957", "10013fbb7c2ddad7") // api.SetCookie("PASSPORT_DELIMONT_TOKEN", "PBE_2.0_5cd1c6141c127d4188f026ac01fc93656266683e8dfb3127c2fdf894259e9034125ff3bdd2a997a385802ee3ef1802ba93a04acea34fde2d2b6e802c5dcd4ec6e3f4ad909a1d806e3ceeb349ed726b03d60ed1fe7010d4140aa338d9c5f05e3fec172c78d3d7f0ca579d61b7015af1bf99aa46b04d2b8a64aa50646dc09afe94b6b60e0ba9a933635db5e8b2a035e9b6d693b289acf1b256d5b9a3f8478c87b0b009115bfd1394f20bb5a0dc2c07b8d013a25f286ec6bf7f2d86010d65507e31358834b7a6b58fbd88cb3f1a12cf71c997b91c1527f6f3c10693f7c2bd6073da8633a98cd2dc1114dfa5be5ee0e60b02cf7e4a94d0fb563a8c01717e7c050f02249117219c07a2eb211577c208ba77f4d536fa25139bc249be93b38d6fc495ef67a32aa206835d177db402bc534de1d29caf4f6b4fbcd912c13f167d00d1732222744c336a5189728f72fb5e153c4b1164171cfb0c811f34f4c2fedd43f721b8706b43f8d631251c") //api.SetCookie("WMUSS", "NTE2NDMTAwMDAyNzYxNzAwOTEyTmUzNWJNcDlQ ") //api.SetCookie("WMSTOKEN", "NTE2NDMTAwMDAyNzYxNzAwOTEyTmUzNWJNcDlQ ") diff --git a/platformapi/ebaiapi/order_test.go b/platformapi/ebaiapi/order_test.go index 54935dd6..bc0026ed 100644 --- a/platformapi/ebaiapi/order_test.go +++ b/platformapi/ebaiapi/order_test.go @@ -4,6 +4,8 @@ import ( "encoding/json" "fmt" "git.rosy.net.cn/jx-callback/globals" + "io/ioutil" + "net/http" "strings" "testing" "time" @@ -44,14 +46,14 @@ func getTimeFromInterface1(timeValue interface{}) time.Time { func TestOrderAgreePartRefund(t *testing.T) { param := &RefundOrderExamine{ ReverseOrderId: "", - OrderId: "4016410136052874965", + OrderId: "4033500150064003740", IdempotentId: utils.Int64ToStr(time.Now().UnixNano()), ActionType: RefundTypeRefuse, ReasonCode: "7001", ReasonRemarks: "1111", } refundProductList := make([]*RefundProductList, 0, 0) - date, _, _ := api.GetReverseOrder("4016410136052874965") + date, _, _ := api.GetReverseOrder("4033500150064003740") for _, v := range date { v2 := v.(map[string]interface{}) refundProduct := &RefundProductList{ @@ -138,7 +140,8 @@ func TestOrderListAll(t *testing.T) { } func TestOrderPartRefundGet(t *testing.T) { - result, err := api.OrderPartRefundGet("4048550075863379470") + result, err := api.OrderPartRefundGet("4033500150064003740") + fmt.Println(utils.MustInterface2Int64(result["merchant_income"])) if err != nil { t.Fatal(err) } else { @@ -252,90 +255,57 @@ func TestOrderQueryAcceptancecode(t *testing.T) { } } -func TestForAA(t *testing.T) { +type Data1 struct { + Data interface{} `json:"data"` + Code int `json:"code"` + Msg string `json:"msg"` +} - var a = []int64{6044969, - 6043622, - 6044971, - 6042562, - 31728, - 31729, - 32143, - 32142, - 6043605, - 6043604, - 6042743, - 30226, - 30225, - 6043959, - 6043960, - 6042349, - 6042296, - 31882, - 31871, - 6042704, - 6039499, - 30415, - 30414, - 32364, - 32363, - 6043603, - 6043602, - 30224, - 30223, - 6042284, - 30215, - 30214, - 6039424, - 31235, - 30368, - 30370, - 30369, - 30183, - 30182, - 6042733, - 6042737, - 30237, - 30236, - 6042287, - 30213, - 6042288, - 30233, - 30207, - 30206, - 30190, - 30189, - 6042167, - 6042166, - 30413} +func TestGetMtData(t *testing.T) { + url := "https://shangoue.meituan.com/reuse/sc/product/shangou/ucube/r/getProducts?yodaReady=h5&csecplatform=4&csecversion=2.4.0" + pageNum := 1 + strList := make([]string, 0, 0) + for { + payload := strings.NewReader("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"pageNum\"\r\n\r\n" + utils.Int2Str(pageNum) + + "\r\n-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"pageSize\"\r\n\r\n100" + + "\r\n-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"templateId\"\r\n\r\n24" + + "\r\n-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"wmPoiId\"\r\n\r\n20760911\r\n-----011000010111000001101001--\r\n\r\n") - var cc = "" - for _, v := range a { - if v != 30413 { - cc += utils.Int64ToStr(v) + "," + req, _ := http.NewRequest("POST", url, payload) + + req.Header.Add("Cookie", `uuid_update=true; _lxsdk_cuid=18a8c469cebc8-0d5443d9234ef1-26021051-240000-18a8c469cebc8; uuid=19f97d5039dc40979c40.1701152326.1.0.0; device_uuid=!303ca77f-1f5c-4db9-8beb-2140b78696e2; pushToken=01YLhAxagh8b3tlBORRhDbRt9URjGhSdCG84G5-PA1w0*; WEBDFPID=29z4yy3y961959z509u92w75626y558381x7618yx56979584y00uw64-2016762763564-1701402763564QQKUMAGfd79fef3d01d5e9aadc18ccd4d0c95073707; iuuid=6150CECD00F8926053D5784EE8E108EC3F622CECA73B5042408DE46AB37C3D80; _lxsdk=6150CECD00F8926053D5784EE8E108EC3F622CECA73B5042408DE46AB37C3D80; n=tel1808018; e_u_id_3299326472=cbee20e50a13edae555928828ac9a4e7; _ga=GA1.1.2133425411.1707118186; isNewCome=1; _ga_95GX0SH5GM=GS1.1.1730448478.2.1.1730448606.0.0.0; wm_order_channel=default; swim_line=default; utm_source=; _lx_utm=utm_source%3DBaidu%26utm_medium%3Dorganic; au_trace_key_net=default; openh5_uuid=6150CECD00F8926053D5784EE8E108EC3F622CECA73B5042408DE46AB37C3D80; isIframe=false; mtcdn=K; userTicket=NWQspZZHEKhavgSsahmXAhrPIfKMJTzafKhWifyg; wpush_server_url=wss://wpush.meituan.com; acctId=183320634; token=0E7ksb36K1-IyWKIQaE5W_qqFdFOr1Jg54jD4aoKkDDU*; brandId=-1; isOfflineSelfOpen=0; city_id=0; isChain=1; existBrandPoi=true; ignore_set_router_proxy=true; region_id=; region_version=0; newCategory=true; bsid=eo5EYZF6ACWlfHJinMd5V2SY6oIXbfytL5DlOUctgPAiRRgON_rJ3meItgRw12c5-hqVkUy1D-qB3JQdgrTfUg; grayPath=newRoot; cityId=510100; provinceId=510000; city_location_id=0; location_id=0; gatherPoi=; cacheTimeMark=2024-11-07; _gw_ab_call_29855_7=TRUE; _gw_ab_29855_7=80; igateApp=shangouepc; timeout=2000; pharmacistAccount=0; accessToken=eo5EYZF6ACWlfHJinMd5V2SY6oIXbfytL5DlOUctgPAiRRgON_rJ3meItgRw12c5-hqVkUy1D-qB3JQdgrTfUg; _gw_ab_call_31449_50=TRUE; _gw_ab_31449_50=866; wmPoiId=20760911; wmPoiName=%E6%99%A8%E5%85%89%E6%96%87%E5%85%B7%EF%BC%88%E4%B9%9D%E6%B1%9F%E5%BA%97%EF%BC%89; shopCategory=market; signToken="xbmL6cP7LyPPTl8Sl+TJBLOGZTvv8Akw9MtDIah2IA4+bpGQVQb1cPNwdRP7/W6mRsEhGuB4YNlvG+4rN1ykMtt9xTbNd1YCkZTjV6tUeBk1XbLLsNJ652VgtwYe8bWgWg3L2J/UYfYCl3ZT9tu1nw=="; logistics_support=1; set_info=%7B%22wmPoiId%22%3A20760911%2C%22ignoreSetRouterProxy%22%3Atrue%7D; logan_session_token=kje3jttthj5mbubh9geg; _lxsdk_s=1930484d165-c2d-357-ea3%7C%7C165`) + req.Header.Add("mtgsig", `{"a1":"1.1","a2":1730948559156,"a3":"29z4yy3y961959z509u92w75626y558381x7618yx56979584y00uw64","a5":"Ef9M2utMucRATMZ1exYWZT/HTU+wmBOk","a6":"h1.56rrQch2k10ZGgB+uJXlxBvZNZl6ZLsE1GUIEXsRA1c8cGiuKlv/K4DPdwGXXFCQR2y6/lpotSTuTmsw9gJa9lqle27OAS7ImcdsJY63ssbUyaVULRu7CRfFv9EvjYTi+iUr9QqDiWDIZ2XYLmLtJw7bCF1qP1AJ3pPq8vDQw8yM0L11UDIU4MZKo599omSYZRacgXRiOvm4wuRaJCL3SRUNYr32o8H+7xzOiQb8ztbfFNk9klmFBwurBGUo0jwmHY2ECH+hQEeqYR/K3Eer81do7lDh/wE7FdmNmiNHm9tY6LtTYi52GU/DwPNkDvM1RV/8JJH2BEeieMPjjhHmfIqlASJv7odfGt3BpjOUdXlrZ4YYBaZL5VUx3z6DDp1tWD+Ar1s1O4OF6tHdK4ra/Uw==","x0":4,"d1":"405ec0522582813313a7597365dc4166"}`) + req.Header.Add("content-type", "multipart/form-data; boundary=---011000010111000001101001") + + res, _ := http.DefaultClient.Do(req) + + defer res.Body.Close() + body, _ := ioutil.ReadAll(res.Body) + SpData := &Data1{} + if err := json.Unmarshal(body, SpData); err != nil { + globals.SugarLogger.Debugf("-----err := %v", err) } - cc += utils.Int64ToStr(v) + + for _, v := range SpData.Data.(map[string]interface{})["productGroups"].([]interface{}) { + if v.(map[string]interface{})["productVo"] != nil { + strSql := fmt.Sprintf("INSERT INTO sp_data VALUES(null,'%s','%s')", v.(map[string]interface{})["productVo"].(map[string]interface{})["name"], v.(map[string]interface{})["productVo"].(map[string]interface{})["upcCode"]) + strList = append(strList, strSql) + } + } + if pageNum == 6 { + break + } + pageNum += 1 } - fmt.Println(cc) + + fmt.Println("=====", len(strList)) + for k, i2 := range strList { + fmt.Println(k-k, i2) + time.Sleep(100 * time.Millisecond) + } + } -func TestOnline(t *testing.T) { - fmt.Println(0&(2|4|32) != 0) - fmt.Println(MergeStoreStatus(-2, 1)) -} - -// 合并得到最终的门店状态 -func MergeStoreStatus(status int, vendorStatus int) int { - if status < vendorStatus { - return status - } - return vendorStatus -} - -func Test223(t *testing.T) { - var statuss []int - if err := utils.UnmarshalUseNumber([]byte("[20]"), &statuss); err != nil { - fmt.Println(err) - } - fmt.Println(statuss) +func Test1(t *testing.T) { + fmt.Println(time.Now().AddDate(0, 0, 1).Sub(time.Now()).Seconds()) } diff --git a/platformapi/ebaiapi/shop_sku_test.go b/platformapi/ebaiapi/shop_sku_test.go index 9a5581d1..65fa3eb2 100644 --- a/platformapi/ebaiapi/shop_sku_test.go +++ b/platformapi/ebaiapi/shop_sku_test.go @@ -26,7 +26,7 @@ func TestShopCategoryGet(t *testing.T) { } func TestShopGet222(t *testing.T) { - data, err := api.ShopGet("", 32267258844) + data, err := api.ShopGet("", 1255670921) fmt.Println(data) fmt.Println(err) } diff --git a/platformapi/jdapi/order_test.go b/platformapi/jdapi/order_test.go index 6b33ccf4..c676e842 100644 --- a/platformapi/jdapi/order_test.go +++ b/platformapi/jdapi/order_test.go @@ -135,9 +135,9 @@ func TestOrderQuery2(t *testing.T) { orderList, _, err := api.OrderQuery2(&OrderQueryParam{ OrderPurchaseTimeBegin: "2024-07-20 00:00:00", OrderPurchaseTimeEnd: "2024-07-29 23:59:59", - DeliveryStationNo: "12297793", + DeliveryStationNo: "11972065", PageNo: 1, - PageSize: 99999, + PageSize: 10, }) //orderList, _, err := api.OrderQuery2(&OrderQueryParam{ // OrderID: 2404021632000192, diff --git a/platformapi/jdapi/sku_test.go b/platformapi/jdapi/sku_test.go index ccc78166..ac754c1c 100644 --- a/platformapi/jdapi/sku_test.go +++ b/platformapi/jdapi/sku_test.go @@ -4,7 +4,6 @@ import ( "fmt" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/globals" - "strings" "testing" ) @@ -34,11 +33,6 @@ func TestGetSkuCategoryByName(t *testing.T) { globals.SugarLogger.Debugf("data:=%v", err) } -func Test222(t *testing.T) { - fmt.Println(1&256 == 0) - fmt.Println(strings.Split("120220915001877", "_")[0]) -} - // //func TestQueryChildCategoriesForOP(t *testing.T) { // result, err := api.QueryChildCategoriesForOP(0) diff --git a/platformapi/jxprintapi/jxprintapi_test.go b/platformapi/jxprintapi/jxprintapi_test.go index a2820803..3d3e9f7b 100644 --- a/platformapi/jxprintapi/jxprintapi_test.go +++ b/platformapi/jxprintapi/jxprintapi_test.go @@ -74,7 +74,7 @@ func TestGetPrintMsg(t *testing.T) { } func TestGetPrinterStatus(t *testing.T) { - result, err := api.GetPrinterStatus("120220915001594") + result, err := api.GetPrinterStatus("120220915001292") if err != nil { t.Fatal(err) } diff --git a/platformapi/mtwmapi/im.go b/platformapi/mtwmapi/im.go index e25fda88..01fa72aa 100644 --- a/platformapi/mtwmapi/im.go +++ b/platformapi/mtwmapi/im.go @@ -58,7 +58,6 @@ func (a *API) MsgSend(pushContent string) (interface{}, error) { retVal, err := a.AccessAPI("ecommerce/IM/msgSend", false, map[string]interface{}{ "push_content": pushContent, }) - //fmt.Println(retVal) return retVal, err } diff --git a/platformapi/mtwmapi/im_test.go b/platformapi/mtwmapi/im_test.go index 3fd7dfc3..19af38bc 100644 --- a/platformapi/mtwmapi/im_test.go +++ b/platformapi/mtwmapi/im_test.go @@ -73,13 +73,14 @@ func TestRdbSet(t *testing.T) { func TestSendMsg(t *testing.T) { data := PushContentReq{ AppID: 589, - AppPoiCode: "8694203", - MsgID: 20230615, - MsgContent: "QYEyt4edHFiW0Fg0iKqeSKZ+Dab9zKJWSLwQuE38J+XL/1BUIwkqy3sf3E9lOK77", + AppPoiCode: "7290541", + MsgID: 1729566539763500, + MsgContent: "cqH27xu/6vS+eqmykE39nA==", MsgSource: 1, MsgType: 1, Cts: int(time.Now().Unix()), - OpenUserID: 12248014636, + OrderID: 3801305470340611516, + OpenUserID: 9548822498, } dataMar, err := json.Marshal(data) fmt.Println(string(dataMar)) diff --git a/platformapi/mtwmapi/mtwmapi_test.go b/platformapi/mtwmapi/mtwmapi_test.go index 2f7cb944..b22cdc0e 100644 --- a/platformapi/mtwmapi/mtwmapi_test.go +++ b/platformapi/mtwmapi/mtwmapi_test.go @@ -26,7 +26,7 @@ func init() { //api = New("4123", "df2c88338b85f830cebce2a9eab56628", "", "") //商超 - //api = New("5873", "41c479790a76f86326f89e8048964739", "", "token_q3-GrKUcZmNq-l4JzH5EjQ") //token_n4TwqCntWWuvQwAawzxC0w + //api = New("5873", "41c479790a76f86326f89e8048964739", "", "token_rZp9k-xKBRNYDKwdl11GKQ") //token_n4TwqCntWWuvQwAawzxC0w //cookieStr := ` // acctId=57396785; token=0bWbK5VbK50E2BmIhIH2zHB-am_y7mB37yXHm6RLZWx4*; wmPoiId=-1; //` diff --git a/platformapi/mtwmapi/order.go b/platformapi/mtwmapi/order.go index 25da67c9..aa84cf55 100644 --- a/platformapi/mtwmapi/order.go +++ b/platformapi/mtwmapi/order.go @@ -3,6 +3,7 @@ package mtwmapi import ( "encoding/json" "errors" + "fmt" "git.rosy.net.cn/baseapi/utils" "time" ) @@ -500,10 +501,14 @@ func (a *API) OrderGetOrderDetail(orderID int64, isMTLogistics bool) (orderInfo params["is_mt_logistics"] = 1 } result, err := a.AccessAPI("order/getOrderDetail", true, params) - if err == nil { - return result.(map[string]interface{}), nil + if err != nil { + return nil, err } - return nil, err + // 老是出现零号流水号订单,还不知道怎么生成的,这个地方直接掐断一下看看 + if int(utils.MustInterface2Int64(result.(map[string]interface{})["day_seq"])) == 0 { + return nil, fmt.Errorf("订单流水号不能为0") + } + return result.(map[string]interface{}), nil } func (a *API) OrderGetPartRefundFoods(orderID int64) (canRefundFoodList []*CanRefundFoodInfo, err error) { diff --git a/platformapi/mtwmapi/order_test.go b/platformapi/mtwmapi/order_test.go index 4725b0f0..0ebe81dd 100644 --- a/platformapi/mtwmapi/order_test.go +++ b/platformapi/mtwmapi/order_test.go @@ -31,7 +31,7 @@ func getTimeFromTimestamp(timeStamp int64) time.Time { } func TestOrderGetOrderDetail(t *testing.T) { - result, err := api.OrderGetOrderDetail(3801286993953393183, false) + result, err := api.OrderGetOrderDetail(3201343422470567673, false) if err != nil { t.Fatal(err) } diff --git a/platformapi/mtwmapi/retail_test.go b/platformapi/mtwmapi/retail_test.go index 487f568e..71bf38e3 100644 --- a/platformapi/mtwmapi/retail_test.go +++ b/platformapi/mtwmapi/retail_test.go @@ -189,7 +189,7 @@ func TestRetailListCase(t *testing.T) { } func TestRetailGet(t *testing.T) { - orderDetail, _ := api.OrderGetOrderDetail(701174470752904572, false) + orderDetail, _ := api.OrderGetOrderDetail(2201338341781067927, false) if addressFee, ok := orderDetail["address_change_fee"]; ok { fmt.Println(addressFee) } @@ -239,7 +239,7 @@ func TestBatchSetPrice(t *testing.T) { } func TestRetailDelete(t *testing.T) { - poiCode := "9855198" + poiCode := "9206018" i := 0 count := 0 @@ -252,11 +252,11 @@ func TestRetailDelete(t *testing.T) { } count += len(fromFoodList) - for k, v := range fromFoodList { - if err := api.RetailDelete(utils.Int2Str(k), poiCode, v.AppFoodCode); err != nil { - fmt.Println(err) - } - } + //for k, v := range fromFoodList { + // if err := api.RetailDelete(utils.Int2Str(k), poiCode, v.AppFoodCode); err != nil { + // fmt.Println(err) + // } + //} i++