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 10:10:33 +08:00
parent b1289e0d39
commit 6f84c186b1
3 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -438,7 +438,7 @@ func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeiso
return nil, errors.New("订单未分配骑手,或订单已经完成了") return nil, errors.New("订单未分配骑手,或订单已经完成了")
} }
return &mtpsapi.RiderInfo{ result := &mtpsapi.RiderInfo{
OrderId: "", OrderId: "",
ThirdCarrierOrderId: orderId, ThirdCarrierOrderId: orderId,
CourierName: order.TransporterName, CourierName: order.TransporterName,
@@ -447,5 +447,24 @@ func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeiso
LogisticsStatus: order.StatusCode, LogisticsStatus: order.StatusCode,
Latitude: order.TransporterLat, Latitude: order.TransporterLat,
Longitude: order.TransporterLng, Longitude: order.TransporterLng,
}, nil }
switch order.StatusCode {
//case 20: // 骑手接单
// result.LogisticsStatus = model.WaybillStatusCourierAssigned
case 100: // 骑手到店
result.LogisticsStatus = model.WaybillStatusCourierArrived
case 3: // 配送中
result.LogisticsStatus = model.WaybillStatusDelivering
case 4: // 完成
result.LogisticsStatus = model.WaybillStatusDelivered
case 5: // 取消
result.LogisticsStatus = model.WaybillStatusAcceptCanceled
case 9: // 配送异常
result.LogisticsStatus = model.WaybillStatusDeliverFailed
default:
result.LogisticsStatus = 0
}
return result, nil
} }

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

@@ -302,7 +302,7 @@ func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeiso
return nil, err return nil, err
} }
return &mtpsapi.RiderInfo{ result := &mtpsapi.RiderInfo{
OrderId: utils.Int64ToStr(order.TrackingId), OrderId: utils.Int64ToStr(order.TrackingId),
ThirdCarrierOrderId: orderId, ThirdCarrierOrderId: orderId,
CourierName: knightInfo.CarrierDriverName, CourierName: knightInfo.CarrierDriverName,
@@ -311,5 +311,24 @@ func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeiso
LogisticsStatus: order.OrderStatus, // 默认正在配送中 LogisticsStatus: order.OrderStatus, // 默认正在配送中
Latitude: knightInfo.CarrierDriverLatitude, Latitude: knightInfo.CarrierDriverLatitude,
Longitude: knightInfo.CarrierDriverLongitude, Longitude: knightInfo.CarrierDriverLongitude,
}, nil }
switch order.OrderStatus {
case 20: // 骑手接单
result.LogisticsStatus = model.WaybillStatusCourierAssigned
case 80: // 骑手到店
result.LogisticsStatus = model.WaybillStatusCourierArrived
case 2: // 配送中
result.LogisticsStatus = model.WaybillStatusDelivering
case 3: // 完成
result.LogisticsStatus = model.WaybillStatusDelivered
case 4: // 取消
result.LogisticsStatus = model.WaybillStatusAcceptCanceled
case 5: // 配送异常
result.LogisticsStatus = model.WaybillStatusDeliverFailed
default:
result.LogisticsStatus = 0
}
return result, nil
} }

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

@@ -26,7 +26,7 @@ import (
//注：若同步配送状态为“配送单已取消”，接口仍支持继续同步配送状态。 说明：商家如未上传此信息，则平台默认值为20（现已要求必传）。 //注：若同步配送状态为“配送单已取消”，接口仍支持继续同步配送状态。 说明：商家如未上传此信息，则平台默认值为20（现已要求必传）。
func GetOrderRiderInfoToPlatform(orderId string) { func GetOrderRiderInfoToPlatform(orderId string) {
params := make(map[string]interface{}, 0) params := make(map[string]interface{}, 0)
params["statuss"] ="[20]" params["statuss"] = "[20]"
params["isDateFinish"] = false params["isDateFinish"] = false
params["isIncludeFake"] = true params["isIncludeFake"] = true
params["mustInvoice"] = false params["mustInvoice"] = false
@@ -85,7 +85,7 @@ func GetOrderRiderInfoToPlatform(orderId string) {
riderInfo.LogisticsProviderCode = "10032" riderInfo.LogisticsProviderCode = "10032"
} }
riderInfo.ThirdCarrierOrderId = v.VendorWaybillID riderInfo.ThirdCarrierOrderId = v.VendorWaybillID
switch v.Status { switch riderInfo.LogisticsStatus {
case 20: //配送中 case 20: //配送中
riderInfo.LogisticsStatus = 20 riderInfo.LogisticsStatus = 20
case 110: // 完成 case 110: // 完成