diff --git a/business/jxstore/initdata/initdata.go b/business/jxstore/initdata/initdata.go index afd72cd03..71b45aa2e 100644 --- a/business/jxstore/initdata/initdata.go +++ b/business/jxstore/initdata/initdata.go @@ -249,20 +249,20 @@ func Convert2JDSPU(ctx *jxcontext.Context, count int, isAsync, isContinueWhenErr } globals.SugarLogger.Debugf("Convert2JDSPU, skuName:%s, skuCount:%d", skuName.Name, len(skuList)) + dao.Begin(db) + skuNameNew2 := *skuName + skuNameNew := &skuNameNew2 + dao.WrapAddIDCULEntity(skuNameNew, ctx.GetUserName()) + skuNameNew.JdID = 0 + skuNameNew.LinkID = skuName.ID + skuNameNew.IsSpu = 1 + skuNameNew.JdSyncStatus = model.SyncFlagNewMask + // skuNameNew.Status = model.SkuStatusDontSale + if err = dao.CreateEntity(db, skuNameNew); err != nil { + dao.Rollback(db) + return "", err + } if len(skuList) > 0 { - dao.Begin(db) - skuNameNew2 := *skuName - skuNameNew := &skuNameNew2 - dao.WrapAddIDCULEntity(skuNameNew, ctx.GetUserName()) - skuNameNew.JdID = 0 - skuNameNew.LinkID = skuName.ID - skuNameNew.IsSpu = 1 - skuNameNew.JdSyncStatus = model.SyncFlagNewMask - // skuNameNew.Status = model.SkuStatusDontSale - if err = dao.CreateEntity(db, skuNameNew); err != nil { - dao.Rollback(db) - return "", err - } for _, sku := range skuList { skuNew2 := *sku skuNew := &skuNew2 @@ -289,16 +289,17 @@ func Convert2JDSPU(ctx *jxcontext.Context, count int, isAsync, isContinueWhenErr return "", err } } - dao.Commit(db) } + dao.Commit(db) } sql = ` - SELECT t1.* + SELECT DISTINCT t1.* FROM sku_name t1 + JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = ? WHERE t1.link_id <> 0; ` skuNameList = []*model.SkuName{} - if err = dao.GetRows(db, &skuNameList, sql); err != nil { + if err = dao.GetRows(db, &skuNameList, sql, utils.DefaultTimeValue); err != nil { return "", err } rootTask := tasksch.NewParallelTask("Convert2JDSPU", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx.GetUserName(), func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {