From b6659baf728810f6cfe2489e526dc65686cc9c4f Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 2 Dec 2019 16:21:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=86=E7=B1=BB=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=97=B6=E6=B2=A1=E6=9C=89=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=E6=9B=B4=E6=96=B0JdSyncStatus=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/sku.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index bfa4091ed..ffc6b8979 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -208,8 +208,8 @@ func ReorderCategories(ctx *jxcontext.Context, parentID int, categoryIDs []int, } for k, v := range categoryIDs { catsMap[v].Seq = k - catsMap[v].JdSyncStatus |= model.SyncFlagModifiedMask - if _, err = dao.UpdateEntity(db, catsMap[v], "Seq"); err != nil { + catsMap[v].LastOperator = ctx.GetUserName() + if _, err = dao.UpdateEntity(db, catsMap[v]); err != nil { break } } From 5c8af121d6971609de48fa858d125949629c5db2 Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 2 Dec 2019 18:14:02 +0800 Subject: [PATCH 2/2] ExpectedDeliveredTime --- business/partner/purchase/jx/localjx/order.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index c79014b79..d774d4cca 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -443,7 +443,7 @@ func jxOrder2GoodsOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, deliveryAd ConsigneeName: deliveryAddress.ConsigneeName, ConsigneeMobile: deliveryAddress.ConsigneeMobile, ConsigneeMobile2: deliveryAddress.ConsigneeMobile, - ConsigneeAddress: deliveryAddress.DetailAddress, + ConsigneeAddress: fmt.Sprintf("%s%s", deliveryAddress.Address, deliveryAddress.DetailAddress), CoordinateType: model.CoordinateTypeMars, ConsigneeLng: jxutils.StandardCoordinate2Int(deliveryAddress.Lng), ConsigneeLat: jxutils.StandardCoordinate2Int(deliveryAddress.Lat), @@ -458,7 +458,7 @@ func jxOrder2GoodsOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, deliveryAd } order.OrderCreatedAt = order.StatusTime order.VendorUserID = order.UserID - if jxOrder.ExpectedDeliveredTimestamp == 0 { + if jxOrder.ExpectedDeliveredTimestamp != 0 { order.ExpectedDeliveredTime = utils.Timestamp2Time(jxOrder.ExpectedDeliveredTimestamp) order.BusinessType = model.BusinessTypeDingshida } else {