1

business/jxstore/cms/cms.go

@@ -617,6 +617,7 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way
 		//origin      = fmt.Sprintf("%f,%f", sLng, sLat)
 		//destination = fmt.Sprintf("%f,%f", uLng, uLat)
 		db         = dao.GetDB()
+		vendorMaps = map[int]int{model.VendorIDDada: 1, model.VendorIDFengNiao: 1, model.VendorIDMTPS: 1, model.VendorIDUUPT: 1, model.VendorIDSFPS: 1}
 	)
 
 	for {
@@ -643,6 +644,7 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way
 			}
 			//}
 
+			if vendorMaps[v.WaybillVendorID] == model.YES {
 				// 如果是三方配送,更新骑手信息
 				if handler := partner.GetDeliveryPlatformFromVendorID(v.WaybillVendorID); handler != nil {
 					riderInfo, _ := handler.Handler.GetRiderInfo(v.VendorOrderID, v.ID+1000000, v.VendorWaybillID)
@@ -660,6 +662,7 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way
 						}
 					}
 				}
+			} else {
 				// 如果是平台配送,获取骑手信息
 				if handler := partner.GetPurchaseOrderHandlerFromVendorID(v.WaybillVendorID); handler != nil {
 					riderInfo, _ := handler.OrderLogisticsStatus(v.VendorOrderID)
@@ -677,6 +680,7 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way
 						}
 					}
 				}
+			}
 
 			// 当这个运单为假物流/门店真实自送/获取运单骑手信息为空的时候使用假的骑手信息
 			if v.WaybillVendorID == model.VendorJXFakeWL || v.WaybillVendorID == model.VendorIDUnknown || v.CourierCoordinate == "" {

business/partner/delivery/sfps/waybill.go

@@ -281,7 +281,7 @@ func (d DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo
 }
 
 func (d DeliveryHandler) ComplaintRider(bill *model.Waybill, resonID int, resonContent string) (err error) {
-	return nil
+	return fmt.Errorf("顺丰暂未实现投诉")
 }
 
 // GetDeliverLiquidatedDamages 获取取消运单违约金