From 80fbee68a53e7b169659f3159a317ef34a9ca8ac Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 23 Jul 2018 15:54:30 +0800 Subject: [PATCH] - dada cancelorder api orderid means the thirdpart orderid. --- platformapi/dadaapi/order.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/platformapi/dadaapi/order.go b/platformapi/dadaapi/order.go index 6e846c46..536ee7a8 100644 --- a/platformapi/dadaapi/order.go +++ b/platformapi/dadaapi/order.go @@ -83,7 +83,6 @@ func map2CreateOrderResponse(mapData map[string]interface{}) *CreateOrderRespons if value, ok := mapData["insuranceFee"]; ok { retVal.CouponFee = utils.MustInterface2Float64(value) } - return retVal } @@ -91,12 +90,10 @@ func (a *API) operateOrder(action string, orderInfo *OperateOrderRequiredParams, params := structs.Map(orderInfo) params["callback"] = a.callbackURL allParams := utils.MergeMaps(params, addParams) - result, err := a.AccessAPI(action, allParams) if err != nil { return nil, err } - return map2CreateOrderResponse(result.Result.(map[string]interface{})), nil } @@ -116,16 +113,14 @@ func (a *API) AddOrderAfterQuery(orderInfo *OperateOrderRequiredParams, addParam return a.operateOrder("api/order/addAfterQuery", orderInfo, addParams) } -func (a *API) CancelOrder(orderId string, cancelOrderReasonId int, cancelOrderReason string) (retVal *CancelOrderResponse, err error) { - mapData := utils.Params2Map("order_id", orderId, "cancel_reason_id", cancelOrderReasonId, "cancel_reason", cancelOrderReason) +func (a *API) CancelOrder(thirdPartOrderID string, cancelOrderReasonId int, cancelOrderReason string) (retVal *CancelOrderResponse, err error) { + mapData := utils.Params2Map("order_id", thirdPartOrderID, "cancel_reason_id", cancelOrderReasonId, "cancel_reason", cancelOrderReason) result, err := a.AccessAPI("api/order/formalCancel", mapData) if err != nil { return nil, err } - mapResult := result.Result.(map[string]interface{}) retVal = new(CancelOrderResponse) retVal.DeductFee = utils.MustInterface2Float64(mapResult["deduct_fee"]) - return retVal, nil }