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

- test

Browse Source
This commit is contained in:
gazebo
2019-01-04 14:42:37 +08:00
parent 25dd701a6a
commit 55b56e0a06
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
business/jxstore/initdata/initdata.go
View File

@@ -249,7 +249,6 @@ func Convert2JDSPU(ctx *jxcontext.Context, count int, isAsync, isContinueWhenErr
} }
globals.SugarLogger.Debugf("Convert2JDSPU, skuName:%s, skuCount:%d", skuName.Name, len(skuList)) globals.SugarLogger.Debugf("Convert2JDSPU, skuName:%s, skuCount:%d", skuName.Name, len(skuList))
if len(skuList) > 0 {
dao.Begin(db) dao.Begin(db)
skuNameNew2 := *skuName skuNameNew2 := *skuName
skuNameNew := &skuNameNew2 skuNameNew := &skuNameNew2
@@ -263,6 +262,7 @@ func Convert2JDSPU(ctx *jxcontext.Context, count int, isAsync, isContinueWhenErr
dao.Rollback(db) dao.Rollback(db)
return "", err return "", err
} }
if len(skuList) > 0 {
for _, sku := range skuList { for _, sku := range skuList {
skuNew2 := *sku skuNew2 := *sku
skuNew := &skuNew2 skuNew := &skuNew2
@@ -289,16 +289,17 @@ func Convert2JDSPU(ctx *jxcontext.Context, count int, isAsync, isContinueWhenErr
return "", err return "", err
} }
} }
}
dao.Commit(db) dao.Commit(db)
} }
}
sql = ` sql = `
SELECT t1.* SELECT DISTINCT t1.*
FROM sku_name t1 FROM sku_name t1
JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = ?
WHERE t1.link_id <> 0; WHERE t1.link_id <> 0;
` `
skuNameList = []*model.SkuName{} 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 return "", err
} }
rootTask := tasksch.NewParallelTask("Convert2JDSPU", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx.GetUserName(), func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { rootTask := tasksch.NewParallelTask("Convert2JDSPU", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx.GetUserName(), func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {