From 6c57a0d38994a003f046f7133fab5995d02b275c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 16 May 2022 14:49:25 +0800 Subject: [PATCH] 1 --- business/partner/delivery/dada/waybill.go | 5 +++-- business/partner/delivery/mtps/waybill.go | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go index 1f6790d7e..c22b5ad88 100644 --- a/business/partner/delivery/dada/waybill.go +++ b/business/partner/delivery/dada/waybill.go @@ -94,8 +94,9 @@ func (c *DeliveryHandler) onWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaap default: order.Status = model.WaybillStatusUnknown } - delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID)// 骑手位置更新 - return dadaapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), utils.Int2Str(order.Status)) + err := dadaapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), utils.Int2Str(order.Status)) + delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID) // 骑手位置更新 + return err } func (c *DeliveryHandler) callbackMsg2Waybill(msg *dadaapi.CallbackMsg) (retVal *model.Waybill) { diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index b3126a828..680bed6e1 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -119,9 +119,10 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m c.pushToGy(msg) return mtpsapi.SuccessResponse } - delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID)// 骑手位置更新 + err := mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus) + delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID) // 骑手位置更新 // 加入调度器 - return mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus) + return err } func (c *DeliveryHandler) pushToGy(msg *mtpsapi.CallbackOrderMsg) {