1

business/partner/delivery/rider.go

@@ -59,35 +59,26 @@ func GetOrderRiderInfoToPlatform(orderId string) {
 				riderInfo, err = handlerInfo.Handler.GetRiderInfo(v.VendorOrderID, 0, v.VendorWaybillID)
 				if err != nil {
 					globals.SugarLogger.Debug("Get Order waybill rider info err FN/DADA :%v", err)
-					continue
 				}
 			} else if v.WaybillVendorID == model.VendorIDMTPS {
-				if v.VendorWaybillID == "" {
-					continue
+				if v.VendorWaybillID != "" {
+					riderInfo, err = handlerInfo.Handler.GetRiderInfo(v.VendorOrderID, v.ID+1000000, v.VendorWaybillID)
+					if err != nil {
+						globals.SugarLogger.Debug("Get Order waybill rider info err MT:%v", err)
+					}
 				}
-				riderInfo, err = handlerInfo.Handler.GetRiderInfo(v.VendorOrderID, v.ID+1000000, v.VendorWaybillID)
-				if err != nil {
-					globals.SugarLogger.Debug("Get Order waybill rider info err MT:%v", err)
-					continue
-				}
-			} else {
-				continue
 			}
 		}
-		if riderInfo.CourierName == "" {
-			globals.SugarLogger.Debug("同步外卖骑手位置信息到美团失败，为获取到订单的骑手信息:", "----")
-			continue
+		if riderInfo.CourierName == "" && v.WaybillVendorID == -1 && v.DeliveryType == "store"{ // 真商家自送
+			riderInfo.OrderId = v.VendorOrderID
+			riderInfo.LogisticsStatus = v.Status
+			riderInfo.CourierName = "石锋"
+			riderInfo.CourierPhone = "18048531223"
+			riderInfo.LogisticsProviderCode = "10017"
+			globals.SugarLogger.Debug("同步外卖骑手位置信息到美团失败，未获取到订单的骑手信息:", "----")
 		}
-		//if v.WaybillVendorID == model.VendorIDDada {
-		//	riderInfo.LogisticsProviderCode = "10002"
-		//	riderInfo.OrderId = v.VendorOrderID // 运单id
-		//}
-		//if v.WaybillVendorID == model.VendorIDFengNiao {
-		//	riderInfo.LogisticsProviderCode = "10004"
-		//}
-		//if v.WaybillVendorID == model.VendorIDMTPS {
-		//	riderInfo.LogisticsProviderCode = "10032"
-		//}
+
+
 		riderInfo.ThirdCarrierOrderId = v.VendorWaybillID
 		switch riderInfo.LogisticsStatus {
 		case 20: //配送中