diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index 814606356..a132c3f0b 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -150,7 +150,7 @@ func (c *PurchaseHandler) onOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaiapi. } else { status := c.callbackMsg2Status(msg) err := partner.CurOrderManager.OnOrderStatusChanged(status) - retVal = ebaiapi.Err2CallbackResponse(err, status.VendorStatus) + retVal = api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, status.VendorStatus) } return retVal } @@ -160,7 +160,7 @@ func (c *PurchaseHandler) onOrderNew(msg *ebaiapi.CallbackMsg) (response *ebaiap if err == nil { err = partner.CurOrderManager.OnOrderNew(order, order.VendorStatus) } - return ebaiapi.Err2CallbackResponse(err, "ebai onOrderNew") + return api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, "ebai onOrderNew") } func (c *PurchaseHandler) callbackMsg2Status(msg *ebaiapi.CallbackMsg) *model.OrderStatus { @@ -173,7 +173,7 @@ func (c *PurchaseHandler) callbackMsg2Status(msg *ebaiapi.CallbackMsg) *model.Or RefVendorID: model.VendorIDEBAI, VendorStatus: body["status"].(string), Status: c.GetStatusFromVendorStatus(body["status"].(string)), - StatusTime: utils.Timestamp2Time(msg.TimeStamp), + StatusTime: utils.Timestamp2Time(msg.Timestamp), Remark: utils.Interface2String(body["reason"]), } return orderStatus diff --git a/business/partner/purchase/ebai/waybill.go b/business/partner/purchase/ebai/waybill.go index affda5f89..a3eeec872 100644 --- a/business/partner/purchase/ebai/waybill.go +++ b/business/partner/purchase/ebai/waybill.go @@ -35,12 +35,12 @@ func (c *PurchaseHandler) onWaybillMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaiap order := c.callbackMsg2Waybill(msg) if order.Status == model.WaybillStatusAccepted { if result, err := api.EbaiAPI.OrderGet(order.VendorOrderID); err != nil { - return ebaiapi.Err2CallbackResponse(err, order.VendorOrderID) + return api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, order.VendorOrderID) } else { order.CourierMobile = utils.Interface2String(result["order"].(map[string]interface{})["delivery_phone"]) } } - return ebaiapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus) + return api.EbaiAPI.Err2CallbackResponse(msg.Cmd, partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus) } func (c *PurchaseHandler) callbackMsg2Waybill(msg *ebaiapi.CallbackMsg) (retVal *model.Waybill) { @@ -55,7 +55,7 @@ func (c *PurchaseHandler) callbackMsg2Waybill(msg *ebaiapi.CallbackMsg) (retVal CourierName: "", // 饿百取不到骑手的名字 // CourierMobile: msg.Phone, VendorStatus: vendorStatus, - StatusTime: utils.Timestamp2Time(msg.TimeStamp), + StatusTime: utils.Timestamp2Time(msg.Timestamp), } return retVal }