From 95be84e1802d6fbcc5da16425b637bf4d7ca7b08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 19 May 2022 11:56:44 +0800 Subject: [PATCH] 1 --- business/partner/delivery/dada/waybill.go | 4 ++-- business/partner/delivery/fn/waybill.go | 4 ++-- business/partner/delivery/mtps/waybill.go | 4 ++-- business/partner/delivery/rider.go | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go index c4ffa0294..e2ee40a50 100644 --- a/business/partner/delivery/dada/waybill.go +++ b/business/partner/delivery/dada/waybill.go @@ -439,8 +439,8 @@ func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeiso } result := &mtpsapi.RiderInfo{ - OrderId: "", - ThirdCarrierOrderId: orderId, + OrderId: orderId, + ThirdCarrierOrderId: mtPeisongId, CourierName: order.TransporterName, CourierPhone: order.TransporterPhone, LogisticsProviderCode: string(mtpsapi.DaDaCode), diff --git a/business/partner/delivery/fn/waybill.go b/business/partner/delivery/fn/waybill.go index 2e26f6ca4..af026a0a2 100644 --- a/business/partner/delivery/fn/waybill.go +++ b/business/partner/delivery/fn/waybill.go @@ -303,8 +303,8 @@ func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeiso } result := &mtpsapi.RiderInfo{ - OrderId: utils.Int64ToStr(order.TrackingId), - ThirdCarrierOrderId: orderId, + OrderId: orderId, + ThirdCarrierOrderId: utils.Int64ToStr(order.TrackingId), CourierName: knightInfo.CarrierDriverName, CourierPhone: knightInfo.CarrierDriverPhone, LogisticsProviderCode: string(mtpsapi.FnPsCode), diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index 872716025..0aaa110c3 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -398,8 +398,8 @@ func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeiso } return &mtpsapi.RiderInfo{ - OrderId: utils.Interface2String(order["mt_peisong_id"]), - ThirdCarrierOrderId: orderId, + OrderId: orderId, + ThirdCarrierOrderId: utils.Interface2String(order["mt_peisong_id"]), CourierName: utils.Interface2String(order["courier_name"]), CourierPhone: utils.Interface2String(order["courier_phone"]), LogisticsProviderCode: string(mtpsapi.MTPsCode), diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 7d87ba252..a9119a5e7 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -56,7 +56,7 @@ func GetOrderRiderInfoToPlatform(orderId string) { riderInfo := &mtpsapi.RiderInfo{} if handlerInfo := partner.GetDeliveryPlatformFromVendorID(v.WaybillVendorID); handlerInfo != nil { if v.WaybillVendorID == model.VendorIDDada || v.WaybillVendorID == model.VendorIDFengNiao { - riderInfo, err = handlerInfo.Handler.GetRiderInfo(v.VendorOrderID, 0, "") + riderInfo, err = handlerInfo.Handler.GetRiderInfo(v.VendorOrderID, 0, v.VendorWaybillID) if err != nil { globals.SugarLogger.Debug("Get Order waybill rider info err FN/DADA :%v", err) continue