diff --git a/platformapi/fnpsapi/order_test.go b/platformapi/fnpsapi/order_test.go index 8d6ca25d..a7eaca88 100644 --- a/platformapi/fnpsapi/order_test.go +++ b/platformapi/fnpsapi/order_test.go @@ -80,3 +80,13 @@ func TestComplaintRider(t *testing.T) { } // t.Log(utils.Format4Output(result, false)) } + +func TestCancelOrder(t *testing.T) { + err := api.CancelOrder(&CancelOrderParam{ + PartnerOrderCode: "18100216009800000001", + }) + if err != nil { + t.Fatal(err) + } + // t.Log(utils.Format4Output(result, false)) +} diff --git a/platformapi/jdapi/jdapi_test.go b/platformapi/jdapi/jdapi_test.go index 530ef745..7b1a10cc 100644 --- a/platformapi/jdapi/jdapi_test.go +++ b/platformapi/jdapi/jdapi_test.go @@ -23,14 +23,14 @@ 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 = "YDYCWYUGKSROMV3MKJQIFINJ5CLPYH6IRVFUMFJD3JI6VQKHX3YPHTWDIDBNMCBUKSY3P7SKAHHKR7PHQDSFRXZEWXA4XOUTALIQDGDYIEUCMDPWSYGDVT42DJ27CD27QKCR3UN7KF7EPIHGPR7GCRTBD74X63QU33D6OXYLYS75ST62BDN6CKXV4NIZQE4JCSH5SDJGL5IRCMW5LSS3DBBCFIRROH3XVFVLZMKFUSXY6PZJ36X3GB4I7VDFCMKWJZQPN4QJ677RTKLO6JLIL2JXURUFAZSE6C6CNOMI6L2TAK43JJIJQRQAQUQSU537ZFLVPGBYFDJYY" + const cookieValue = "OPJQMA7B3FTKCAUGO7FHCH5NMBGAWGGXYRNLEHYYZNGNPNIBCAM4IOEPG3NT3RIA44G5C3535Q5LGG4F4SR4AZVLGYKYTKFJJKEAOXENVBL5VXNILRP3GLNVVWA26XZ3VGSYOHA72RICMVZS3G53DTEH3JWVXCZBKYQN5CW57OZAUUGW26BM5GBMDUKCPJGLYBMEIVPIGG6PY2HOZTQL5PWKCSDJLG7AKSLKUQ422BVJDNQ36DIA74FV7RFQMMQPNJ5YQMCG2M72IH43LZDVSAYZWKUGAVD7VFRMEYTOXYHWCYVDXJ6HYFIPWIN3ULLXDDLN2ICON4GRK" api.SetJdCookie(cookieValue) // api.SetCookie("user", "GXBMZPW62YXDDG4NE5JDLJJJHWWGJFKML56GHPDEUP6E65UMM4MQ2OB3RYHSEGXGEP5RT55TQZ3PJEXQVYJSNEBNZVY76BZPTRJTZTTZEEJRFHJ4JM5NZ6XI3TEG3X54QBIFC4C5WZUMEN6XHATZBIGB4XKWNNCAAVX4SNS5EIQTQBALUVFPM52OJ3X6L4MONINJDVRVL2UGV6BUPHOMBUWCNPP3AAKAQAXGI3DJA6LUXWO32ILD6E5QHFYGLC6SFRTUQPAUJJXGSGIIZBICUOPVZ7HJW4XPEJFBZU5TAEXOOWKXSK6RWKS6ABQGWC5SHKC73UFVR3WYW3XI5UUIUVWHXTFH6VNYCS4BV5Q") // api.SetCookieWithStr(` diff --git a/platformapi/jdapi/store.go b/platformapi/jdapi/store.go index 70a07714..b0523cac 100644 --- a/platformapi/jdapi/store.go +++ b/platformapi/jdapi/store.go @@ -477,3 +477,14 @@ func parsePrivilegeSearchUser(data map[string]interface{}) (innerData interface{ } return innerData, err } + +func (a *API) QueryMerchantMemberInfo(vendorOrgCode string) (deliveryRange *StoreDeliveryRange, err error) { + jdParams := map[string]interface{}{ + "orgCode": vendorOrgCode, + } + result, err := a.AccessAPI2("member/queryMerchantMemberInfo", jdParams, "") + if err == nil { + err = JdMap2StructByJson(result, &deliveryRange, false) + } + return deliveryRange, err +} diff --git a/platformapi/jdapi/store_page.go b/platformapi/jdapi/store_page.go index d2b29675..9e1cc72d 100644 --- a/platformapi/jdapi/store_page.go +++ b/platformapi/jdapi/store_page.go @@ -566,6 +566,30 @@ func (a *API) AccessStorePage4(fullURL string, values string) (retVal interface{ return retVal, err } +func (a *API) AccessStorePage5(fullURL string, params map[string]interface{}) (retVal interface{}, err error) { + if a.GetCookieCount() == 0 { + return nil, fmt.Errorf("需要设置Store Cookie才能使用此方法") + } + err = platformapi.AccessPlatformAPIWithRetry(a.client, + func() *http.Request { + request, _ := http.NewRequest(http.MethodPost, fullURL, strings.NewReader(utils.Map2URLValues(params).Encode())) + if err != nil { + return nil + } + a.FillRequestCookies(request) + return request + }, + a.config, + func(response *http.Response, bodyStr string, jsonResult1 map[string]interface{}) (errLevel string, err error) { + if jsonResult1 == nil { + return platformapi.ErrLevelRecoverableErr, fmt.Errorf("mapData is nil") + } + retVal = jsonResult1 + return "", err + }) + return retVal, err +} + func (a *API) AccessStorePage(fullURL string, params map[string]interface{}, isPost bool) (retVal map[string]interface{}, err error) { result, err := a.AccessStorePage2(fullURL, params, isPost, ResultKeyResult) if err == nil { @@ -1313,3 +1337,32 @@ func (a *API) SetCode(code, jdAppID string) (err error) { }, true, "") return err } + +type QueryMemberTransListByConditionResult struct { + Bindingtypestr string `json:"bindingTypeStr"` + Cardcreatetime string `json:"cardcreateTime"` + Endtimestr string `json:"endTimeStr"` + Fromsourcestr string `json:"fromSourceStr"` + Fromstorename string `json:"fromStoreName,omitempty"` + Merchantcardno string `json:"merchantCardNo"` + Orgcodestr string `json:"orgCodeStr"` + Paymoney string `json:"payMoney"` + Starttimestr string `json:"startTimeStr"` + Validtype int `json:"validType"` + Createtime string `json:"createTime,omitempty"` + Dealstatus int `json:"dealStatus,omitempty"` + Orderid string `json:"orderId,omitempty"` + Orderstatusstr string `json:"orderStatusStr,omitempty"` + Ordertypestr string `json:"orderTypeStr,omitempty"` +} + +func (a *API) QueryMemberTransListByCondition(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, + }) + if err == nil { + utils.Map2StructByJson(result.(map[string]interface{})["rows"], &queryMemberTransListByConditionResult, false) + } + return queryMemberTransListByConditionResult, err +} diff --git a/platformapi/jdapi/store_page_test.go b/platformapi/jdapi/store_page_test.go index cee73eeb..1e64d1a4 100644 --- a/platformapi/jdapi/store_page_test.go +++ b/platformapi/jdapi/store_page_test.go @@ -30,8 +30,8 @@ func TestGetRealMobileNumber4Order(t *testing.T) { } func TestGetStoreOrderInfo(t *testing.T) { - orderId := "2109303620000162" - orderInfo, err := api.GetStoreOrderInfo(orderId, "11906188") + orderId := "2111389500000761" + orderInfo, err := api.GetStoreOrderInfo(orderId, "11857499") if err != nil { t.Fatal(err) } @@ -309,6 +309,10 @@ func TestPeiZhiJdZhangHao(t *testing.T) { } } -func TestSecond(t *testing.T) { - +func TestQueryMemberTransListByCondition(t *testing.T) { + result, err := api.QueryMemberTransListByCondition(1, 10) + if err != nil { + t.Fatal(err) + } + t.Log(utils.Format4Output(result, false)) } diff --git a/platformapi/jdapi/store_test.go b/platformapi/jdapi/store_test.go index ab95eeca..d91c15d5 100644 --- a/platformapi/jdapi/store_test.go +++ b/platformapi/jdapi/store_test.go @@ -149,3 +149,11 @@ func TestGetDeliveryRangeByStationNo(t *testing.T) { } baseapi.SugarLogger.Debug(utils.Format4Output(result, false)) } + +func TestQueryMerchantMemberInfo(t *testing.T) { + result, err := api.QueryMerchantMemberInfo("320406") + if err != nil { + t.Fatal(err) + } + baseapi.SugarLogger.Debug(utils.Format4Output(result, false)) +} diff --git a/platformapi/mtunionapi/mtunionapi_test.go b/platformapi/mtunionapi/mtunionapi_test.go index 4c0b3ba6..0d9a1c75 100644 --- a/platformapi/mtunionapi/mtunionapi_test.go +++ b/platformapi/mtunionapi/mtunionapi_test.go @@ -36,7 +36,7 @@ func TestMiniCode(t *testing.T) { } func TestGenerateLink(t *testing.T) { - result, err := api.GenerateLink(2, 4, strings.ToLower("efa9876238fc11eb9101525400c36bda903")) + result, err := api.GenerateLink(2, 1, strings.ToLower("9999999999999")) if err != nil { t.Fatal(err) }