diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 6bf94964b..c058396f4 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -1498,13 +1498,6 @@ func SumExianDaDepot(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) skus.UpcIds, } 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) //京西库中存在此商品 if skuNameExt.ID != 0 { @@ -1522,9 +1515,8 @@ func SumExianDaDepot(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) flag = true } if flag { - _, err = dao.UpdateEntity(db, skuNameExt, "Name") + _, err = dao.UpdateEntity(db, skuNameExt, "Name", "Prefix", "SpecUnit", "Unit", "SpecQuality", "Img") if err != nil { - dao.Rollback(db) return result, err } } @@ -1559,7 +1551,6 @@ func SumExianDaDepot(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) dao.WrapAddIDCULDEntity(skuName, ctx.GetUserName()) err = dao.CreateEntity(db, skuName) if err != nil { - dao.Rollback(db) return result, err } sku := &model.Sku{ @@ -1574,11 +1565,9 @@ func SumExianDaDepot(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) dao.WrapAddIDCULDEntity(sku, ctx.GetUserName()) err = dao.CreateEntity(db, sku) if err != nil { - dao.Rollback(db) return result, err } } - dao.Commit(db) return retVal, err } taskParallel := tasksch.NewParallelTask("更新京西上饿鲜达商品库", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx, taskFunc, results)