Merge branch 'master' into get-store
This commit is contained in:
gazebo
@@ -4,6 +4,7 @@ import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strings"
|
||||
|
||||
"git.rosy.net.cn/baseapi"
|
||||
"git.rosy.net.cn/baseapi/platformapi"
|
||||
@@ -11,8 +12,9 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
accessStorePageCookieName = "shop.o2o.jd.com1"
|
||||
getStoreURL = "https://daojia.jd.com"
|
||||
getStoreURL = "https://daojia.jd.com"
|
||||
accessStorePageCookieName = "shop.o2o.jd.com1"
|
||||
accessStorePageCookieName2 = "lsp-store1.jddj.com"
|
||||
)
|
||||
|
||||
type SkuPageImg struct {
|
||||
@@ -21,6 +23,48 @@ type SkuPageImg struct {
|
||||
Small string `json:"small"`
|
||||
}
|
||||
|
||||
type CorporationInfo struct {
|
||||
Scope string `json:"scope"`
|
||||
OperName string `json:"oper_name"`
|
||||
Status string `json:"status"`
|
||||
BelongOrg string `json:"belong_org"`
|
||||
CreditNo string `json:"credit_no"`
|
||||
RegNo string `json:"reg_no"`
|
||||
ID string `json:"id"`
|
||||
OrgNo string `json:"org_no"`
|
||||
EconKind string `json:"econ_kind"`
|
||||
EndDate string `json:"end_date"`
|
||||
TermEnd string `json:"term_end"`
|
||||
NeedID bool `json:"needID"`
|
||||
Address string `json:"address"`
|
||||
Partners []struct {
|
||||
IdentifyType string `json:"identify_type"`
|
||||
ShouldCapiItems []interface{} `json:"should_capi_items"`
|
||||
StockType string `json:"stock_type"`
|
||||
IdentifyNo string `json:"identify_no"`
|
||||
RealCapiItems []interface{} `json:"real_capi_items"`
|
||||
Name string `json:"name"`
|
||||
} `json:"partners"`
|
||||
Name string `json:"name"`
|
||||
Province string `json:"province"`
|
||||
TermStart string `json:"term_start"`
|
||||
AbnormalItems []interface{} `json:"abnormal_items"`
|
||||
CheckDate string `json:"check_date"`
|
||||
RegistCapi string `json:"regist_capi"`
|
||||
StartDate string `json:"start_date"`
|
||||
Changerecords []struct {
|
||||
BeforeContent string `json:"before_content"`
|
||||
ChangeDate string `json:"change_date"`
|
||||
ChangeItem string `json:"change_item"`
|
||||
AfterContent string `json:"after_content"`
|
||||
} `json:"changerecords"`
|
||||
Branches []interface{} `json:"branches"`
|
||||
Employees []struct {
|
||||
JobTitle string `json:"job_title"`
|
||||
Name string `json:"name"`
|
||||
} `json:"employees"`
|
||||
}
|
||||
|
||||
func (a *API) SetStoreCookie(storeCookie string) {
|
||||
a.locker.Lock()
|
||||
defer a.locker.Unlock()
|
||||
@@ -33,14 +77,21 @@ func (a *API) GetStoreCookie() string {
|
||||
return a.storeCookie
|
||||
}
|
||||
|
||||
func (a *API) AccessStorePage(fullURL string) (retVal map[string]interface{}, err error) {
|
||||
func (a *API) AccessStorePage(fullURL string, formData map[string]interface{}) (retVal map[string]interface{}, err error) {
|
||||
storeCookie := a.GetStoreCookie()
|
||||
if storeCookie == "" {
|
||||
return nil, fmt.Errorf("需要设置Store Cookie才能使用此方法")
|
||||
}
|
||||
err = platformapi.AccessPlatformAPIWithRetry(a.client,
|
||||
func() *http.Request {
|
||||
request, _ := http.NewRequest(http.MethodGet, fullURL, nil)
|
||||
var request *http.Request
|
||||
if formData == nil {
|
||||
request, _ = http.NewRequest(http.MethodGet, fullURL, nil)
|
||||
} else {
|
||||
request, _ = http.NewRequest(http.MethodPost, fullURL, strings.NewReader(utils.Map2URLValues(formData).Encode()))
|
||||
request.Header.Set("charset", "UTF-8")
|
||||
request.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||
}
|
||||
if err != nil {
|
||||
return nil
|
||||
}
|
||||
@@ -48,10 +99,14 @@ func (a *API) AccessStorePage(fullURL string) (retVal map[string]interface{}, er
|
||||
Name: accessStorePageCookieName,
|
||||
Value: storeCookie,
|
||||
})
|
||||
request.AddCookie(&http.Cookie{
|
||||
Name: accessStorePageCookieName2,
|
||||
Value: storeCookie,
|
||||
})
|
||||
return request
|
||||
},
|
||||
a.config,
|
||||
func(jsonResult1 map[string]interface{}) (errLevel string, err error) {
|
||||
func(response *http.Response, jsonResult1 map[string]interface{}) (errLevel string, err error) {
|
||||
retVal = jsonResult1
|
||||
code := jsonResult1["code"].(string)
|
||||
if code == ResponseCodeSuccess {
|
||||
@@ -84,7 +139,7 @@ func (a *API) GetStoreOrderInfo(orderId, stationNo string) (storeOrderInfo map[s
|
||||
if stationNo != "" {
|
||||
urlStr += "&stationNo=" + stationNo
|
||||
}
|
||||
retVal, err := a.AccessStorePage(urlStr)
|
||||
retVal, err := a.AccessStorePage(urlStr, nil)
|
||||
// baseapi.SugarLogger.Debug(utils.Format4Output(retVal, false))
|
||||
if err == nil {
|
||||
newOrderinfoMains := retVal["newOrderinfoMains"].(map[string]interface{})
|
||||
@@ -102,7 +157,7 @@ func (a *API) GetStoreOrderInfoList(fromTime, toTime string) (storeOrderList []m
|
||||
pageNo := 1
|
||||
urlTemplate := "http://store.jddj.com/order/newManager/tabQuery/all?o2oOrderType=10000&pageNo=%d&pageSize=%d&orderBy=&desc=true&startTimeQuery=%s&endTimeQuery=%s&stationNo="
|
||||
for {
|
||||
retVal, err := a.AccessStorePage(fmt.Sprintf(urlTemplate, pageNo, pageSize, url.QueryEscape(fromTime), url.QueryEscape(toTime)))
|
||||
retVal, err := a.AccessStorePage(fmt.Sprintf(urlTemplate, pageNo, pageSize, url.QueryEscape(fromTime), url.QueryEscape(toTime)), nil)
|
||||
// baseapi.SugarLogger.Debug(utils.Format4Output(retVal, false))
|
||||
if err == nil {
|
||||
newOrderinfoMains := retVal["newOrderinfoMains"].(map[string]interface{})
|
||||
@@ -124,10 +179,7 @@ func (a *API) GetSkuPageInfo(skuId int64) (skuPageInfo map[string]interface{}, e
|
||||
"skuId": utils.Int64ToStr(skuId),
|
||||
"storeId": "0",
|
||||
}
|
||||
skuPageInfo, err = a.AccessStorePage(fmt.Sprintf("https://daojia.jd.com/client?platCode=H5&functionId=product/detailV6_0&body=%s", utils.Format4Output(skuIDMap, true)))
|
||||
if err == nil {
|
||||
baseapi.SugarLogger.Debug(utils.Format4Output(skuPageInfo, false))
|
||||
}
|
||||
skuPageInfo, err = a.AccessStorePage(fmt.Sprintf("https://daojia.jd.com/client?platCode=H5&functionId=product/detailV6_0&body=%s", utils.Format4Output(skuIDMap, true)), nil)
|
||||
return skuPageInfo, err
|
||||
}
|
||||
|
||||
@@ -140,34 +192,22 @@ func (a *API) GetSkuPageImageInfo(skuId int64) (imgList []*SkuPageImg, err error
|
||||
}
|
||||
|
||||
func (a *API) GetStoreInfo(storeId string) (storeInfo map[string]interface{}, err error) {
|
||||
retVal, err := a.AccessStorePage2(fmt.Sprintf("client?functionId=store/storeDetailV220&body={\"storeId\":\"%s\"}&appVersion=6.1.0", storeId))
|
||||
return retVal, err
|
||||
}
|
||||
|
||||
func (a *API) AccessStorePage2(subURL string) (retVal map[string]interface{}, err error) {
|
||||
err = platformapi.AccessPlatformAPIWithRetry(a.client,
|
||||
func() *http.Request {
|
||||
fullURL := utils.GenerateGetURL(getStoreURL, subURL, nil)
|
||||
request, _ := http.NewRequest(http.MethodGet, fullURL, nil)
|
||||
if err != nil {
|
||||
return nil
|
||||
}
|
||||
return request
|
||||
},
|
||||
a.config,
|
||||
func(jsonResult1 map[string]interface{}) (errLevel string, err error) {
|
||||
code := jsonResult1["code"].(string)
|
||||
if code == ResponseCodeSuccess && jsonResult1["result"] != nil {
|
||||
retVal = jsonResult1["result"].(map[string]interface{})
|
||||
return platformapi.ErrLevelSuccess, nil
|
||||
}
|
||||
newErr := utils.NewErrorCode(jsonResult1["msg"].(string), code)
|
||||
return platformapi.ErrLevelCodeIsNotOK, newErr
|
||||
})
|
||||
retVal, err := a.AccessStorePage(fmt.Sprintf("https://daojia.jd.com/client?functionId=store/storeDetailV220&body={\"storeId\":\"%s\"}&appVersion=6.1.0", storeId), nil)
|
||||
return retVal, err
|
||||
}
|
||||
|
||||
func (a *API) GetStoreList(lng string, lat string) (retVal map[string]interface{}, err error) {
|
||||
retVal, err = a.AccessStorePage2(fmt.Sprintf("client?platCode=h5&appVersion=6.5.0&functionId=zone/recommendStoreList&body={\"channelId\":\"3997\",\"currentPage\":1,\"pageSize\":999,\"coordType\":\"2\",\"platform\":\"1\"}&signKey=b63f63fa9e27123b84a0c80ef5cd210d&lng=%s&lat=%s", lng, lat))
|
||||
retVal, err = a.AccessStorePage(fmt.Sprintf("https://daojia.jd.com/client?platCode=h5&appVersion=6.5.0&functionId=zone/recommendStoreList&body={\"channelId\":\"3997\",\"currentPage\":1,\"pageSize\":999,\"coordType\":\"2\",\"platform\":\"1\"}&signKey=b63f63fa9e27123b84a0c80ef5cd210d&lng=%s&lat=%s", lng, lat), nil)
|
||||
return retVal, err
|
||||
}
|
||||
|
||||
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,
|
||||
"qualifyNumber": qualifyNumber,
|
||||
})
|
||||
if err == nil {
|
||||
err = utils.Map2StructByJson(result, &corporatonInfo, false)
|
||||
}
|
||||
return corporatonInfo, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user