From f5f3aef933f86da34d7332c49fdba529a61a8f85 Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 30 Dec 2019 09:42:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?GetOrderWaybillInfo=E4=B8=AD=E5=BD=93isGetP?= =?UTF-8?q?os=E4=B8=BAtrue=E6=97=B6=EF=BC=8C=E6=9A=82=E6=97=B6=E5=BF=BD?= =?UTF-8?q?=E7=95=A5=E7=8A=B6=E6=80=81=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/orderman/orderman_ext.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 175b1584d..60ff706f3 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -181,7 +181,7 @@ func (c *OrderManager) GetOrderWaybillInfo(ctx *jxcontext.Context, vendorOrderID if err == nil && isGetPos { var taskBills []*model.WaybillExt for _, v := range bills { - if v.Status >= model.WaybillStatusAccepted && v.Status <= model.WaybillStatusDelivering { + if true /*v.Status >= model.WaybillStatusAccepted && v.Status <= model.WaybillStatusDelivering*/ { if handler := partner.GetRidderPositionGetter(v.WaybillVendorID); handler != nil { taskBills = append(taskBills, v) } From a56ebdf5dd5b4e6d4392bfc675e3d6b5afb46fde Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 30 Dec 2019 09:45:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?sku2Update=E4=B8=AD=E5=8E=BB=E6=8E=89sku.Sk?= =?UTF-8?q?uID=20=3D=3D=200=E7=9A=84=E5=88=A4=E6=96=AD=EF=BC=88=E5=8F=AA?= =?UTF-8?q?=E8=A6=81sku.NameID=20=3D=3D=200=E5=88=A4=E6=96=AD=E5=B0=B1?= =?UTF-8?q?=E5=A4=9F=E4=BA=86=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/sync_store_sku.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index dabc76dab..f808d311f 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -244,7 +244,7 @@ func sku2Update(vendorID int, sku *dao.StoreSkuSyncInfo, syncStatus int8) (item kvs[dao.GetVendorThingIDStructField(model.VendorNames[vendorID])] = utils.Str2Int64WithDefault(sku.VendorSkuID, 0) } else if model.IsSyncStatusDelete(syncStatus) { sku.SkuSyncStatus = 0 - if utils.IsTimeZero(sku.BindDeletedAt) && (sku.ID == 0 || sku.NameID == 0) { + if utils.IsTimeZero(sku.BindDeletedAt) && (sku.NameID == 0) { kvs[model.FieldDeletedAt] = time.Now() } if !dao.IsVendorThingIDEmpty(sku.VendorSkuID) && !partner.IsMultiStore(vendorID) {