1

business/partner/delivery/fn/waybill.go

@@ -2,7 +2,6 @@ package fn
 
 import (
 	"fmt"
-	"git.rosy.net.cn/baseapi/platformapi/mtpsapi"
 	tao "git.rosy.net.cn/baseapi/platformapi/tao_vegetable"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
@@ -323,7 +322,7 @@ func OnWaybillMsg(msg *fnpsapi.OrderStatusNottify, resultParam *fnpsapi.ShortSta
 
 // 抖音订单状态回传
 func tiktokStatusPush(order *model.Waybill, orderStatus int64) {
-	result := &mtpsapi.RiderInfo{
+	result := &utils.RiderInfo{
 		OrderId:               order.VendorOrderID,
 		ThirdCarrierOrderId:   order.VendorOrderID,
 		CourierName:           order.CourierName,
@@ -393,7 +392,7 @@ func GetDesiredFee(vendorOrderID string) (desiredFee, acuteFee int64) {
 }
 
 // 获取骑手信息
-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.FnAPI.QueryOrder(orderId)
 	if err != nil {
@@ -406,12 +405,12 @@ func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeiso
 		return nil, err
 	}
 
-	result := &mtpsapi.RiderInfo{
+	result := &utils.RiderInfo{
 		OrderId:               orderId,
 		ThirdCarrierOrderId:   utils.Int64ToStr(order.TrackingId),
 		CourierName:           knightInfo.CarrierDriverName,
 		CourierPhone:          knightInfo.CarrierDriverPhone,
-		LogisticsProviderCode: mtpsapi.FnPsCode,
+		LogisticsProviderCode: utils.FnPsCode,
 		LogisticsStatus:       order.OrderStatus, // 默认正在配送中
 		Latitude:              knightInfo.CarrierDriverLatitude,
 		Longitude:             knightInfo.CarrierDriverLongitude,