liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/mark' into yonghui

Browse Source
This commit is contained in:
苏尹岚
2019-12-02 18:23:58 +08:00
parent 4e17b43a22 5c8af121d6
commit ef7d9814fb
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxstore/cms/sku.go
View File

@@ -208,8 +208,8 @@ func ReorderCategories(ctx *jxcontext.Context, parentID int, categoryIDs []int,
} }
for k, v := range categoryIDs { for k, v := range categoryIDs {
catsMap[v].Seq = k catsMap[v].Seq = k
catsMap[v].JdSyncStatus |= model.SyncFlagModifiedMask catsMap[v].LastOperator = ctx.GetUserName()
if _, err = dao.UpdateEntity(db, catsMap[v], "Seq"); err != nil { if _, err = dao.UpdateEntity(db, catsMap[v]); err != nil {
break break
} }
} }

4
business/partner/purchase/jx/localjx/order.go
View File

@@ -443,7 +443,7 @@ func jxOrder2GoodsOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, deliveryAd
ConsigneeName: deliveryAddress.ConsigneeName, ConsigneeName: deliveryAddress.ConsigneeName,
ConsigneeMobile: deliveryAddress.ConsigneeMobile, ConsigneeMobile: deliveryAddress.ConsigneeMobile,
ConsigneeMobile2: deliveryAddress.ConsigneeMobile, ConsigneeMobile2: deliveryAddress.ConsigneeMobile,
ConsigneeAddress: deliveryAddress.DetailAddress, ConsigneeAddress: fmt.Sprintf("%s%s", deliveryAddress.Address, deliveryAddress.DetailAddress),
CoordinateType: model.CoordinateTypeMars, CoordinateType: model.CoordinateTypeMars,
ConsigneeLng: jxutils.StandardCoordinate2Int(deliveryAddress.Lng), ConsigneeLng: jxutils.StandardCoordinate2Int(deliveryAddress.Lng),
ConsigneeLat: jxutils.StandardCoordinate2Int(deliveryAddress.Lat), ConsigneeLat: jxutils.StandardCoordinate2Int(deliveryAddress.Lat),
@@ -458,7 +458,7 @@ func jxOrder2GoodsOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, deliveryAd
} }
order.OrderCreatedAt = order.StatusTime order.OrderCreatedAt = order.StatusTime
order.VendorUserID = order.UserID order.VendorUserID = order.UserID
if jxOrder.ExpectedDeliveredTimestamp == 0 { if jxOrder.ExpectedDeliveredTimestamp != 0 {
order.ExpectedDeliveredTime = utils.Timestamp2Time(jxOrder.ExpectedDeliveredTimestamp) order.ExpectedDeliveredTime = utils.Timestamp2Time(jxOrder.ExpectedDeliveredTimestamp)
order.BusinessType = model.BusinessTypeDingshida order.BusinessType = model.BusinessTypeDingshida
} else { } else {