新增抖音授权登录,添加定时任务,更新[配送中的订单骑手位置!

This commit is contained in:
邹宗楠
2022-04-14 17:03:43 +08:00
parent f4e821b25f
commit 7a5462bf4c
24 changed files with 352 additions and 38 deletions

View File

@@ -3,6 +3,7 @@ package dada
import (
"errors"
"fmt"
"git.rosy.net.cn/baseapi/platformapi/mtpsapi"
"git.rosy.net.cn/baseapi/platformapi/dadaapi"
"git.rosy.net.cn/baseapi/utils"
@@ -83,6 +84,7 @@ func (c *DeliveryHandler) onWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaap
}
case dadaapi.OrderStatusDelivering:
order.Status = model.WaybillStatusDelivering
delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID)
case dadaapi.OrderStatusFinished:
order.Status = model.WaybillStatusDelivered
case dadaapi.OrderStatusCanceled, dadaapi.OrderStatusExpired:
@@ -422,3 +424,26 @@ func (c *DeliveryHandler) GetRidderPosition(ctx *jxcontext.Context, vendorOrgCod
}
return lng, lat, err
}
// 获取骑手信息(订单详情)
func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeisongId string) (rider *mtpsapi.RiderInfo, err error) {
order, err := api.DadaAPI.QueryOrderInfo(orderId)
if err != nil {
return nil, err
}
if order.StatusCode != 3 {
return nil, errors.New("订单未分配骑手,或订单已经完成了")
}
return &mtpsapi.RiderInfo{
OrderId: "",
ThirdCarrierOrderId: orderId,
CourierName: order.TransporterName,
CourierPhone: order.TransporterPhone,
LogisticsProviderCode: string(mtpsapi.DaDaCode),
LogisticsStatus: order.StatusCode,
Latitude: order.TransporterLat,
Longitude: order.TransporterLng,
}, nil
}