From 6d74ea55a1cf60da5857dfad2fd30ff7c262e376 Mon Sep 17 00:00:00 2001 From: suyl <770236076@qq.com> Date: Fri, 14 May 2021 16:33:25 +0800 Subject: [PATCH] aa --- platformapi/ebaiapi/ebaiapi_test.go | 2 +- platformapi/ebaiapi/store_page_test.go | 4 ++-- platformapi/jdapi/store_page.go | 18 ++++++++++++++---- platformapi/jdapi/store_page_test.go | 2 +- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/platformapi/ebaiapi/ebaiapi_test.go b/platformapi/ebaiapi/ebaiapi_test.go index 9df7ee21..a55a11da 100644 --- a/platformapi/ebaiapi/ebaiapi_test.go +++ b/platformapi/ebaiapi/ebaiapi_test.go @@ -40,7 +40,7 @@ func init() { //api.SetCookie("WMUSS", "NTE2NDMTAwMDAyNzYxNzAwOTEyTmUzNWJNcDlQ ") //api.SetCookie("WMSTOKEN", "NTE2NDMTAwMDAyNzYxNzAwOTEyTmUzNWJNcDlQ ") api.SetCookieWithStr(` -UTUSER=0; cna=A9cHGZw1jjgCAd3tly+uuYIG; ubt_ssid=kpqd18ueqc12rljyipjmobcr5vlc3xry_2021-04-23; t=bc6b1c1fc4e7ef841fff494286415f8b; WMUSS=NTE2NDMTAwMDAyNzYxNzAwOTEyTmUzNWJNcDlQ; WMSTOKEN=NTE2NDMTAwMDAyNzYxNzAwOTEyTmUzNWJNcDlQ; OUTER_AUTH_LOGIN=NTE2NDMTAwMDAyNzYxNzAwOTEyTmUzNWJNcDlQ%3BNTE2NDMTAwMDAyNzYxNzAwOTEyTmUzNWJNcDlQ; _m_h5_tk=d7c4e1871b6cef3c40f632818c1c26ea_1620966794276; _m_h5_tk_enc=522f8cd8856adf54fc67b1204852e6f3; xlly_s=1; EGG_SESS=JpQK5bp48HmDcW_gXmvwHOgVztgOM26ic6TGkJ3UQ3vcc8rFp6tItC4jf8nv9WEp; _wmcrmpush=2E9CC70243D10779B1B51C61921101C9_1620285183_00_2267230126_jxgyzd0_1-FD5E7C3682471929B3009FB0674A4925_1620285197_00_32267649750_jingxiguoyuanab500_1-DF90C10E22053108475175AF500A4BCB_1620957437_00_2233065879_hcxsqg0_1; tfstk=c4MfBAAnSZbj5JdN3mtPgA7aHae1ZzsQfIamcXLYq31eXyifijBURrdIsNB89u1..; l=eBgWAKP7jpZewF2oBOfwourza77OSIRAguPzaNbMiOCP_Wfp5FmAB66Qw9Y9C3GVh6l6R37l8fV8BeYBqIc5qegwsUvKEYDmn; isg=BGtrP8Nyjy8w1tP1X2S4ZpgV-o9VgH8CM52rhd3oR6oBfIveZVAPUgne1rwS3Nf6 +UTUSER=0; cna=A9cHGZw1jjgCAd3tly+uuYIG; ubt_ssid=kpqd18ueqc12rljyipjmobcr5vlc3xry_2021-04-23; t=bc6b1c1fc4e7ef841fff494286415f8b; xlly_s=1; _m_h5_tk=04ae81974ec5b88eedc9f03a5f7fe6cc_1620980209236; _m_h5_tk_enc=1918683bae593e636455ee3c7ea4efa2; SWITCH_SHOP=; WMUSS=N2U3OTMTAwMDAyNzYxNzAwOTEyTmUzeEZqczJQ; WMSTOKEN=N2U3OTMTAwMDAyNzYxNzAwOTEyTmUzeEZqczJQ; OUTER_AUTH_LOGIN=N2U3OTMTAwMDAyNzYxNzAwOTEyTmUzeEZqczJQ%3BN2U3OTMTAwMDAyNzYxNzAwOTEyTmUzeEZqczJQ; _wmcrmpush=2AE9B7448B12CAF4424E7BF4C6229B5B_1620971501_00_2233065879_hcxsqg0_1; EGG_SESS=HXhsa0ae3eimhuFUCB_6niZdqRWZnwHYGtQuBxHoxMEBzgRXLwDPCCEH6BeIhCvH; tfstk=cHsNBmgFjlEZNttbyhtqCO6bfrKOZpWGnDJWSw8VDJprydYGikcvK549LKO8xFf..; l=eBgWAKP7jpZewUbSBOfwourza77OSIRAguPzaNbMiOCPsXfp5it5B66FT6T9C3GVh6l6R37l8fV8BeYBqIc5qegwsUvKEYDmn; isg=BBkZNSjrnRZ3SkGPOQKKzEZLKAXzpg1YPZPZ3zvOlcC_QjnUg_YdKIdQRAY0eqWQ `) } diff --git a/platformapi/ebaiapi/store_page_test.go b/platformapi/ebaiapi/store_page_test.go index 06582e7b..176a67fa 100644 --- a/platformapi/ebaiapi/store_page_test.go +++ b/platformapi/ebaiapi/store_page_test.go @@ -10,7 +10,7 @@ import ( ) func TestGetRealMobileNumber4Order(t *testing.T) { - orderId := "15501080494587" + orderId := "5025796789378554068" desiredMobile := "18483673654" mobile, err := api.GetRealMobile4Order(orderId) if err != nil { @@ -23,7 +23,7 @@ func TestGetRealMobileNumber4Order(t *testing.T) { } func TestGetStoreOrderInfo(t *testing.T) { - orderId := "1577329467196263592" + orderId := "5025796789378554068" // desiredMobile := "18483673654" orderInfo, err := api.GetStoreOrderInfo(orderId) if err != nil { diff --git a/platformapi/jdapi/store_page.go b/platformapi/jdapi/store_page.go index 13195543..c62397a1 100644 --- a/platformapi/jdapi/store_page.go +++ b/platformapi/jdapi/store_page.go @@ -588,6 +588,11 @@ func (a *API) AccessStorePage5(fullURL string, params map[string]interface{}) (r return platformapi.ErrLevelRecoverableErr, fmt.Errorf("mapData is nil") } retVal = jsonResult1 + if jsonResult1["fakeData"] != nil { + newErr := utils.NewErrorCode("cookie过期了", "code") + baseapi.SugarLogger.Debugf("jd AccessStorePage failed, jsonResult1:%s", utils.Format4Output(jsonResult1, true)) + return platformapi.ErrLevelCodeIsNotOK, newErr + } return "", err }) return retVal, err @@ -1342,6 +1347,11 @@ func (a *API) SetCode(code, jdAppID string) (err error) { } type QueryMemberTransListByConditionResult struct { + Total int `json:"total"` + Rows []*QueryMemberTransListByConditionList `json:"rows"` +} + +type QueryMemberTransListByConditionList struct { Bindingtypestr string `json:"bindingTypeStr"` Cardcreatetime string `json:"cardcreateTime"` Endtimestr string `json:"endTimeStr"` @@ -1359,7 +1369,7 @@ type QueryMemberTransListByConditionResult struct { Ordertypestr string `json:"orderTypeStr,omitempty"` } -func (a *API) QueryMemberTransListByCondition(page, pageSize int) (queryMemberTransListByConditionResult []*QueryMemberTransListByConditionResult, err error) { +func (a *API) QueryMemberTransListByCondition(beginTime, endTime string, page, pageSize int) (queryMemberTransListByConditionResult *QueryMemberTransListByConditionResult, err error) { result, err := a.AccessStorePage5("https://mermem-sj.jddj.com/memberQuery/queryMemberTransListByCondition", map[string]interface{}{ "page": page, "rows": pageSize, @@ -1370,11 +1380,11 @@ func (a *API) QueryMemberTransListByCondition(page, pageSize int) (queryMemberTr "orderType": "", "startTimeTemp": "", "endTimeTemp": "", - "cardstartTimeTemp": "", - "cardendTimeTemp": "", + "cardstartTimeTemp": beginTime, + "cardendTimeTemp": endTime, }) if err == nil { - utils.Map2StructByJson(result.(map[string]interface{})["rows"], &queryMemberTransListByConditionResult, false) + utils.Map2StructByJson(result.(map[string]interface{}), &queryMemberTransListByConditionResult, false) } return queryMemberTransListByConditionResult, err } diff --git a/platformapi/jdapi/store_page_test.go b/platformapi/jdapi/store_page_test.go index 2ea4d645..ad0946b3 100644 --- a/platformapi/jdapi/store_page_test.go +++ b/platformapi/jdapi/store_page_test.go @@ -310,7 +310,7 @@ func TestPeiZhiJdZhangHao(t *testing.T) { } func TestQueryMemberTransListByCondition(t *testing.T) { - result, err := api.QueryMemberTransListByCondition(4, 20) + result, err := api.QueryMemberTransListByCondition("", "", 4, 200) if err != nil { t.Fatal(err) }