liulei/baseapi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- refactor AccessAPINoPage.

Browse Source 
- product related api added.
This commit is contained in:
gazebo
2018-08-26 09:57:43 +08:00
parent 259a8c896a
commit 8357982612
7 changed files with 625 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
platformapi/jdapi/order.go
View File

@@ -55,19 +55,18 @@ var (
ErrCanNotFindOrder = errors.New("can not find order")
)
func (a API) OrderQuery(jdParams map[string]interface{}) (retVal []interface{}, err error) {
retVal, err = a.AccessAPIHavePage("order/es/query", jdParams, nil, nil, nil)
return
func (a *API) OrderQuery(jdParams map[string]interface{}) (retVal []interface{}, totalCount int, err error) {
return a.AccessAPIHavePage("order/es/query", jdParams, nil, nil, nil)
}
// orderFreightMoney 基础运费
// tips 商家承担小费
// merchantPaymentDistanceFreightMoney 取件服务费(开票)(正向单展示远距离运费;售后单则展示达达售后运费)
// orderBaseFreightMoney ?
func (a API) QuerySingleOrder(orderId string) (map[string]interface{}, error) {
func (a *API) QuerySingleOrder(orderId string) (map[string]interface{}, error) {
jdParams := make(map[string]interface{})
jdParams["orderId"] = orderId
result, err := a.AccessAPIHavePage("order/es/query", jdParams, nil, nil, nil)
result, _, err := a.AccessAPIHavePage("order/es/query", jdParams, nil, nil, nil)
if err != nil {
return nil, err
}
@@ -77,7 +76,7 @@ func (a API) QuerySingleOrder(orderId string) (map[string]interface{}, error) {
return result[0].(map[string]interface{}), nil
}
func (a API) LegacyQuerySingleOrder(orderId string) (map[string]interface{}, error) {
func (a *API) LegacyQuerySingleOrder(orderId string) (map[string]interface{}, error) {
jdParams := make(map[string]interface{})
jdParams["orderId"] = orderId
@@ -98,62 +97,62 @@ func (a API) LegacyQuerySingleOrder(orderId string) (map[string]interface{}, err
return result, nil
}
func (a API) OrderAcceptOperate(orderId string, isAgreed bool, userName string) (interface{}, error) {
func (a *API) OrderAcceptOperate(orderId string, isAgreed bool, userName string) (interface{}, error) {
jdParams := map[string]interface{}{
"orderId": orderId,
"isAgreed": utils.Bool2String(isAgreed),
"operator": utils.GetAPIOperator(userName),
}
return a.AccessAPINoPage("ocs/orderAcceptOperate", jdParams, nil, nil)
return a.AccessAPINoPage("ocs/orderAcceptOperate", jdParams, nil, nil, nil)
}
// 拣货完成且众包配送接口
// https://opendj.jd.com/staticnew/widgets/resources.html?groupid=169&apiid=ed93745b86c6487eaaea5f55a84785ac
func (a API) OrderJDZBDelivery(orderId string, userName string) (interface{}, error) {
func (a *API) OrderJDZBDelivery(orderId string, userName string) (interface{}, error) {
jdParams := map[string]interface{}{
"orderId": orderId,
"operator": utils.GetAPIOperator(userName),
}
return a.AccessAPINoPage("bm/open/api/order/OrderJDZBDelivery", jdParams, nil, nil)
return a.AccessAPINoPage("bm/open/api/order/OrderJDZBDelivery", jdParams, nil, nil, nil)
}
// 订单达达配送转商家自送接口
// https://opendj.jd.com/staticnew/widgets/resources.html?groupid=169&apiid=e7b4950164754eecac7ea87278c2b071
func (a API) ModifySellerDelivery(orderId string, userName string) (interface{}, error) {
func (a *API) ModifySellerDelivery(orderId string, userName string) (interface{}, error) {
jdParams := map[string]interface{}{
"orderId": orderId,
"updatePin": utils.GetAPIOperator(userName),
}
return a.AccessAPINoPage("order/modifySellerDelivery", jdParams, nil, nil)
return a.AccessAPINoPage("order/modifySellerDelivery", jdParams, nil, nil, nil)
}
// 拣货完成且商家自送接口（这个接口是商家本身配置为自送模式下才能调用的接口，如果启用了达达配送，是不能调用的）
// https://opendj.jd.com/staticnew/widgets/resources.html?groupid=169&apiid=0e08e71a45dc48b6a337e06a852ac33a
func (a API) OrderSerllerDelivery(orderId string, userName string) (interface{}, error) {
func (a *API) OrderSerllerDelivery(orderId string, userName string) (interface{}, error) {
jdParams := map[string]interface{}{
"orderId": orderId,
"operator": utils.GetAPIOperator(userName),
}
return a.AccessAPINoPage("bm/open/api/order/OrderSerllerDelivery", jdParams, nil, nil)
return a.AccessAPINoPage("bm/open/api/order/OrderSerllerDelivery", jdParams, nil, nil, nil)
}
// 商家自送，订单妥投接口
// https://opendj.jd.com/staticnew/widgets/resources.html?groupid=169&apiid=ecc80f06d35141979f4841f345001f74
func (a API) DeliveryEndOrder(orderId string, userName string) (interface{}, error) {
func (a *API) DeliveryEndOrder(orderId string, userName string) (interface{}, error) {
jdParams := map[string]interface{}{
"orderId": orderId,
"operPin": utils.GetAPIOperator(userName),
"operTime": utils.GetCurTimeStr(),
}
return a.AccessAPINoPage("ocs/deliveryEndOrder", jdParams, nil, nil)
return a.AccessAPINoPage("ocs/deliveryEndOrder", jdParams, nil, nil, nil)
}
//订单金额拆分接口
func (a API) QueryOassBussMoney(orderId string) ([]interface{}, error) {
func (a *API) QueryOassBussMoney(orderId string) ([]interface{}, error) {
jdParams := map[string]interface{}{
"orderId": orderId,
}
result, err := a.AccessAPINoPage("oassBussService/queryOassBussMoney", jdParams, nil, nil)
result, err := a.AccessAPINoPage("oassBussService/queryOassBussMoney", jdParams, nil, nil, nil)
if err != nil {
return nil, err
}