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

合并饿鲜达商品库并刷新分类

Browse Source
This commit is contained in:
苏尹岚
2020-02-21 13:43:54 +08:00
parent f98dae15f9
commit dbff805874
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1498,13 +1498,6 @@ func SumExianDaDepot(ctx *jxcontext.Context, isAsync, isContinueWhenError bool)
skus.UpcIds, skus.UpcIds,
} }
dao.GetRow(db, skuNameExt, sql2, sqlParams2) dao.GetRow(db, skuNameExt, sql2, sqlParams2)
dao.Begin(db)
defer func() {
if r := recover(); r != nil {
dao.Rollback(db)
panic(r)
}
}()
prefix, _, _, specUnit, unit, specQuality := jxutils.SplitSkuName(v.GoodsName) prefix, _, _, specUnit, unit, specQuality := jxutils.SplitSkuName(v.GoodsName)
//京西库中存在此商品 //京西库中存在此商品
if skuNameExt.ID != 0 { if skuNameExt.ID != 0 {
@@ -1522,9 +1515,8 @@ func SumExianDaDepot(ctx *jxcontext.Context, isAsync, isContinueWhenError bool)
flag = true flag = true
} }
if flag { if flag {
_, err = dao.UpdateEntity(db, skuNameExt, "Name") _, err = dao.UpdateEntity(db, skuNameExt, "Name", "Prefix", "SpecUnit", "Unit", "SpecQuality", "Img")
if err != nil { if err != nil {
dao.Rollback(db)
return result, err return result, err
} }
} }
@@ -1559,7 +1551,6 @@ func SumExianDaDepot(ctx *jxcontext.Context, isAsync, isContinueWhenError bool)
dao.WrapAddIDCULDEntity(skuName, ctx.GetUserName()) dao.WrapAddIDCULDEntity(skuName, ctx.GetUserName())
err = dao.CreateEntity(db, skuName) err = dao.CreateEntity(db, skuName)
if err != nil { if err != nil {
dao.Rollback(db)
return result, err return result, err
} }
sku := &model.Sku{ sku := &model.Sku{
@@ -1574,11 +1565,9 @@ func SumExianDaDepot(ctx *jxcontext.Context, isAsync, isContinueWhenError bool)
dao.WrapAddIDCULDEntity(sku, ctx.GetUserName()) dao.WrapAddIDCULDEntity(sku, ctx.GetUserName())
err = dao.CreateEntity(db, sku) err = dao.CreateEntity(db, sku)
if err != nil { if err != nil {
dao.Rollback(db)
return result, err return result, err
} }
} }
dao.Commit(db)
return retVal, err return retVal, err
} }
taskParallel := tasksch.NewParallelTask("更新京西上饿鲜达商品库", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx, taskFunc, results) taskParallel := tasksch.NewParallelTask("更新京西上饿鲜达商品库", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx, taskFunc, results)