liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2022-05-19 11:56:44 +08:00
parent 995d7f7656
commit 95be84e180
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/partner/delivery/dada/waybill.go
View File

@@ -439,8 +439,8 @@ func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeiso
} }
result := &mtpsapi.RiderInfo{ result := &mtpsapi.RiderInfo{
OrderId: "", OrderId: orderId,
ThirdCarrierOrderId: orderId, ThirdCarrierOrderId: mtPeisongId,
CourierName: order.TransporterName, CourierName: order.TransporterName,
CourierPhone: order.TransporterPhone, CourierPhone: order.TransporterPhone,
LogisticsProviderCode: string(mtpsapi.DaDaCode), LogisticsProviderCode: string(mtpsapi.DaDaCode),

4
business/partner/delivery/fn/waybill.go
View File

@@ -303,8 +303,8 @@ func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeiso
} }
result := &mtpsapi.RiderInfo{ result := &mtpsapi.RiderInfo{
OrderId: utils.Int64ToStr(order.TrackingId), OrderId: orderId,
ThirdCarrierOrderId: orderId, ThirdCarrierOrderId: utils.Int64ToStr(order.TrackingId),
CourierName: knightInfo.CarrierDriverName, CourierName: knightInfo.CarrierDriverName,
CourierPhone: knightInfo.CarrierDriverPhone, CourierPhone: knightInfo.CarrierDriverPhone,
LogisticsProviderCode: string(mtpsapi.FnPsCode), LogisticsProviderCode: string(mtpsapi.FnPsCode),

4
business/partner/delivery/mtps/waybill.go
View File

@@ -398,8 +398,8 @@ func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeiso
} }
return &mtpsapi.RiderInfo{ return &mtpsapi.RiderInfo{
OrderId: utils.Interface2String(order["mt_peisong_id"]), OrderId: orderId,
ThirdCarrierOrderId: orderId, ThirdCarrierOrderId: utils.Interface2String(order["mt_peisong_id"]),
CourierName: utils.Interface2String(order["courier_name"]), CourierName: utils.Interface2String(order["courier_name"]),
CourierPhone: utils.Interface2String(order["courier_phone"]), CourierPhone: utils.Interface2String(order["courier_phone"]),
LogisticsProviderCode: string(mtpsapi.MTPsCode), LogisticsProviderCode: string(mtpsapi.MTPsCode),

2
business/partner/delivery/rider.go
View File

@@ -56,7 +56,7 @@ func GetOrderRiderInfoToPlatform(orderId string) {
riderInfo := &mtpsapi.RiderInfo{} riderInfo := &mtpsapi.RiderInfo{}
if handlerInfo := partner.GetDeliveryPlatformFromVendorID(v.WaybillVendorID); handlerInfo != nil { if handlerInfo := partner.GetDeliveryPlatformFromVendorID(v.WaybillVendorID); handlerInfo != nil {
if v.WaybillVendorID == model.VendorIDDada || v.WaybillVendorID == model.VendorIDFengNiao { 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 { if err != nil {
globals.SugarLogger.Debug("Get Order waybill rider info err FN/DADA :%v", err) globals.SugarLogger.Debug("Get Order waybill rider info err FN/DADA :%v", err)
continue continue