1

business/partner/delivery/dada/waybill.go

@@ -3,7 +3,6 @@ package dada
 import (
 	"errors"
 	"fmt"
-	"git.rosy.net.cn/baseapi/platformapi/mtpsapi"
 	tao "git.rosy.net.cn/baseapi/platformapi/tao_vegetable"
 	"git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
 	"git.rosy.net.cn/jx-callback/business/partner/purchase/tao_vegetable"
@@ -130,7 +129,7 @@ func (c *DeliveryHandler) onWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaap
 
 // 抖音订单状态回传
 func tiktokStatusPush(order *model.Waybill, status int) {
-	result := &mtpsapi.RiderInfo{
+	result := &utils.RiderInfo{
 		OrderId:               order.VendorOrderID,
 		ThirdCarrierOrderId:   order.VendorOrderID,
 		CourierName:           order.CourierName,
@@ -507,18 +506,18 @@ func (c *DeliveryHandler) GetRidderPosition(ctx *jxcontext.Context, vendorOrgCod
 }
 
 // 获取骑手信息(订单详情)
-func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeisongId string) (rider *mtpsapi.RiderInfo, err error) {
+func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeisongId string) (rider *utils.RiderInfo, err error) {
 	order, err := api.DadaAPI.QueryOrderInfo(orderId)
 	if err != nil {
 		return nil, err
 	}
 
-	result := &mtpsapi.RiderInfo{
+	result := &utils.RiderInfo{
 		OrderId:               orderId,
 		ThirdCarrierOrderId:   mtPeisongId,
 		CourierName:           order.TransporterName,
 		CourierPhone:          order.TransporterPhone,
-		LogisticsProviderCode: mtpsapi.DaDaCode,
+		LogisticsProviderCode: utils.DaDaCode,
 		LogisticsStatus:       order.StatusCode,
 		LogisticsContext:      "",
 		Latitude:              order.TransporterLat,