From b626bd9d772225d20c4dff4ab8a83c6dbe46e0aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 7 Sep 2023 16:23:43 +0800 Subject: [PATCH 1/2] 1 --- business/jxstore/misc/misc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 552e2a5da..11aa66c3a 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -210,7 +210,7 @@ func Init() { // 每分钟轮询一次,推送骑手信息(假的订单) ScheduleTimerFuncByInterval(func() { delivery.UpdateFakeWayBillToTiktok() - }, 10*time.Second, 1*time.Minute) + }, 10*time.Second, 2*time.Minute) // 每五分钟轮询一次推送骑手信息坐标给美团(真的订单) ScheduleTimerFuncByInterval(func() { From 14533d1debe26a983e02bf2e90415d0501cd4993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 7 Sep 2023 16:36:32 +0800 Subject: [PATCH 2/2] 1 --- business/partner/delivery/rider.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index ab339e5c1..acd13d2a9 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -460,20 +460,16 @@ func UpdateFakeWayBillToTiktok() { } // 更新运单为完成状态 if fakeWayBill[i].Status == model.WaybillStatusDelivered { - order, err := partner.CurOrderManager.LoadOrder(fakeWayBill[i].VendorOrderID, fakeWayBill[i].OrderVendorID) - if err != nil { - globals.SugarLogger.Errorf("Loading order by wayBill vendorOrderID err := %v", err) - continue - } - if order.Status == model.OrderStatusCanceled { - continue - } - sql := `UPDATE goods_order g SET g.status = ?,g.vendor_status = ?,g.order_finished_at = ? WHERE g.vendor_order_id = ? ` _, err = dao.ExecuteSQL(dao.GetDB(), sql, []interface{}{model.OrderStatusFinished, model.OrderStatusFinished, time.Now(), fakeWayBill[i].VendorOrderID}...) if err != nil { globals.SugarLogger.Debugf("UPDATA goods_order Err :%s", err.Error()) } + + order, _ := partner.CurOrderManager.LoadOrder(fakeWayBill[i].VendorOrderID, fakeWayBill[i].OrderVendorID) + if order.Status == model.OrderStatusCanceled { + continue + } // 饿百订单推送订单送达 if fakeWayBill[i].OrderVendorID == model.VendorIDEBAI || fakeWayBill[i].OrderVendorID == model.VendorIDTaoVegetable || fakeWayBill[i].OrderVendorID == model.VendorIDMTWM { if err := handler.Swtich2SelfDelivered(order, "JingXiAdmin"); err != nil {