From 2ed3abf1185d3f25f784eaa3629253432368d19c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 21 Jul 2023 18:50:10 +0800 Subject: [PATCH] 1 --- business/jxstore/misc/misc.go | 2 +- business/partner/purchase/ebai/order.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 34997ae77..b0cca7a7a 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -749,7 +749,6 @@ func syncStoreSkuTao(beijin []int) { case 0: if beego.BConfig.RunMode != "jxgy" { _, err = cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, nil, 0, db, []int{model.VendorIDTaoVegetable}, beijin[SyncLen:SyncLen+5], false, nil, nil, syncFlag, true, true) - SyncLen += 5 errList.AddErr(err) } case 1: @@ -760,6 +759,7 @@ func syncStoreSkuTao(beijin []int) { return retVal, err }, []int{0, 1}) tasksch.HandleTask(task, nil, true).Run() + SyncLen += 5 } func doDailyWork2() { diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index 80ae20fe0..a8856ba4e 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -399,7 +399,7 @@ func (p *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName s err = nil case ebaiapi.WaybillStatusDeliveryCancled: p.trySyncCancelStatus(order.VendorOrderID) - case ebaiapi.WaybillStatusNew, ebaiapi.WaybillStatusRequestDelivery, ebaiapi.WaybillStatusWait4Courier: + case ebaiapi.WaybillStatusNew, ebaiapi.WaybillStatusEvent, ebaiapi.WaybillStatusRequestDelivery, ebaiapi.WaybillStatusWait4Courier: err = api.EbaiAPI.OrderCancelDelivery(order.VendorOrderID) // 取消呼叫众包骑手 case ebaiapi.WaybillStatusCourierAccepted: err = errors.New("骑手已接单,无法转自送")