1

business/partner/delivery/rider.go

@@ -292,7 +292,7 @@ func makeRiderInfo(fakeWayBill *model.Waybill, riderInfo *mtpsapi.RiderInfo) {
 		fakeWayBill.VendorStatus = utils.Int64ToStr(model.WaybillStatusCourierAssigned)
 	case 12: // 骑手接单
 		riderInfo.LogisticsContext = model.RiderWaitGetGoods
-		riderInfo.LogisticsStatus = 12
+		riderInfo.LogisticsStatus = 10
 		riderInfo.OpCode = tiktok_api.TiktokLogisticsORDERRECEIVED
 		// 下一状态以及推送时间
 		fakeWayBill.Status = model.WaybillStatusCourierArrived
@@ -324,7 +324,7 @@ func makeRiderInfo(fakeWayBill *model.Waybill, riderInfo *mtpsapi.RiderInfo) {
 	return
 }
 
-// UpdateFakeWayBillToTiktok 轮询更新假订单到抖音
+// UpdateFakeWayBillToTiktok 轮询更新假订单到抖音(抖音/美团/饿百)
 func UpdateFakeWayBillToTiktok() {
 	scheduleTimer, _ := rand.Int(rand.Reader, big.NewInt(1000))
 	randTimeSchedule := scheduleTimer.Int64()
@@ -362,7 +362,7 @@ func UpdateFakeWayBillToTiktok() {
 		if riderInfo.LogisticsContext != model.RiderGetOrderDeliverFailed && riderInfo.LogisticsContext != model.RiderGetOrderDeliverOther && riderInfo.LogisticsContext != model.RiderWaitRider {
 			riderInfo.LogisticsContext = fmt.Sprintf(riderInfo.LogisticsContext, riderInfo.CourierName, riderInfo.CourierPhone)
 		}
-		
+
 		// 推送骑手信息
 		paramsMap := utils.Struct2Map(riderInfo, "", true)
 		handler := partner.GetPurchaseOrderHandlerFromVendorID(fakeWayBill[i].OrderVendorID)
@@ -401,7 +401,7 @@ func UpdateFakeWayBillToTiktok() {
 				globals.SugarLogger.Debugf("UPDATA goods_order Err :%s", err.Error())
 			}
 			// 饿百订单推送订单送达
-			if fakeWayBill[i].OrderVendorID == model.VendorIDEBAI {
+			if fakeWayBill[i].OrderVendorID == model.VendorIDEBAI || fakeWayBill[i].OrderVendorID == model.VendorIDMTWM {
 				if err := handler.Swtich2SelfDelivered(order, "JingXiAdmin"); err != nil {
 					globals.SugarLogger.Errorf("Swtich2SelfDelivered err := %v", err)
 				}