diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index f0db3d9d4..54594ae8d 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -1835,156 +1835,84 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { ` sqlParams := []interface{}{utils.DefaultTimeValue} err = dao.GetRows(db, &gy, sql, sqlParams) - for _, v := range gy { - var gyskus []*model.Sku - sql := ` - SELECT * FROM jxgy.sku WHERE name_id = ? AND deleted_at = ? - ` - sqlParams := []interface{}{v.ID, utils.DefaultTimeValue} - err = dao.GetRows(db, &gyskus, sql, sqlParams) - categroyID := 0 - switch v.CategoryID { - case 3039: - categroyID = 510 - case 3040: - categroyID = 511 - case 3041: - categroyID = 512 - case 3042: - categroyID = 514 - case 3070: - categroyID = 516 - } - skuNameExt := &model.SkuNameExt{ - SkuName: model.SkuName{ - Name: v.Name, - Upc: v.Upc, - Status: model.SkuStatusNormal, - CategoryID: categroyID, - IsGlobal: v.IsGlobal, - Unit: v.Unit, - Prefix: v.Prefix, - SpecQuality: v.SpecQuality, - SpecUnit: v.SpecUnit, - Price: v.Price, - Img: v.Img, - Img2: v.Img2, - Img3: v.Img3, - DescImg: v.DescImg, - JdsStockSwitch: v.JdsStockSwitch, - PreparationTime: v.PreparationTime, - }, - } - if skuNameExt.IsGlobal == 0 { - var skuplace []*model.SkuNamePlaceBind - var cityCodes []int + fmt.Println("gylen", len(gy)) + task := tasksch.NewParallelTask("建商品", tasksch.NewParallelConfig().SetIsContinueWhenError(true).SetParallelCount(1), ctx, + func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { + v := batchItemList[0].(*model.SkuName) + var gyskus []*model.Sku sql := ` - SELECT * FROM jxgy.sku_name_place_bind WHERE name_id = ? AND deletad_at = ? + SELECT * FROM jxgy.sku WHERE name_id = ? AND deleted_at = ? ` - sqlParams := []interface{}{ - v.ID, utils.DefaultTimeValue, + sqlParams := []interface{}{v.ID, utils.DefaultTimeValue} + err = dao.GetRows(db, &gyskus, sql, sqlParams) + categroyID := 0 + switch v.CategoryID { + case 3039: + categroyID = 510 + case 3040: + categroyID = 511 + case 3041: + categroyID = 512 + case 3042: + categroyID = 514 + case 3070: + categroyID = 516 } - err = dao.GetRows(db, &skuplace, sql, sqlParams) - for _, vv := range skuplace { - cityCodes = append(cityCodes, vv.PlaceCode) - } - if len(cityCodes) > 0 { - skuNameExt.Places = cityCodes - } - } - var skus []*model.SkuWithVendor - for _, vv := range gyskus { - sku := &model.SkuWithVendor{ - Sku: &model.Sku{ - SpecQuality: vv.SpecQuality, - SpecUnit: vv.SpecUnit, - Weight: vv.Weight, - Status: 1, + skuNameExt := &model.SkuNameExt{ + SkuName: model.SkuName{ + Name: v.Name, + Upc: v.Upc, + Status: model.SkuStatusNormal, + CategoryID: categroyID, + IsGlobal: v.IsGlobal, + Unit: v.Unit, + Prefix: v.Prefix, + SpecQuality: v.SpecQuality, + SpecUnit: v.SpecUnit, + Price: v.Price, + Img: v.Img, + Img2: v.Img2, + Img3: v.Img3, + DescImg: v.DescImg, + JdsStockSwitch: v.JdsStockSwitch, + PreparationTime: v.PreparationTime, }, } - skus = append(skus, sku) - } - skuNameExt.Skus = skus - _, err = cms.AddSkuName(ctx, skuNameExt, ctx.GetUserName()) - break - } - // task := tasksch.NewParallelTask("建商品", tasksch.NewParallelConfig().SetIsContinueWhenError(true).SetParallelCount(1), ctx, - // func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { - // v := batchItemList[0].(*model.SkuName) - // var gyskus []*model.Sku - // sql := ` - // SELECT * FROM jxgy.sku WHERE name_id = ? AND deleted_at = ? - // ` - // sqlParams := []interface{}{v.ID, utils.DefaultTimeValue} - // err = dao.GetRows(db, &gyskus, sql, sqlParams) - // categroyID := 0 - // switch v.CategoryID { - // case 3039: - // categroyID = 510 - // case 3040: - // categroyID = 511 - // case 3041: - // categroyID = 512 - // case 3042: - // categroyID = 514 - // case 3070: - // categroyID = 516 - // } - // skuNameExt := &model.SkuNameExt{ - // SkuName: model.SkuName{ - // Name: v.Name, - // Upc: v.Upc, - // Status: model.SkuStatusNormal, - // CategoryID: categroyID, - // IsGlobal: v.IsGlobal, - // Unit: v.Unit, - // Prefix: v.Prefix, - // SpecQuality: v.SpecQuality, - // SpecUnit: v.SpecUnit, - // Price: v.Price, - // Img: v.Img, - // Img2: v.Img2, - // Img3: v.Img3, - // DescImg: v.DescImg, - // JdsStockSwitch: v.JdsStockSwitch, - // PreparationTime: v.PreparationTime, - // }, - // } - // if skuNameExt.IsGlobal == 0 { - // var skuplace []*model.SkuNamePlaceBind - // var cityCodes []int - // sql := ` - // SELECT * FROM jxgy.sku_name_place_bind WHERE name_id = ? AND deletad_at = ? - // ` - // sqlParams := []interface{}{ - // v.ID, utils.DefaultTimeValue, - // } - // err = dao.GetRows(db, &skuplace, sql, sqlParams) - // for _, vv := range skuplace { - // cityCodes = append(cityCodes, vv.PlaceCode) - // } - // if len(cityCodes) > 0 { - // skuNameExt.Places = cityCodes - // } - // } - // var skus []*model.SkuWithVendor - // for _, vv := range gyskus { - // sku := &model.SkuWithVendor{ - // Sku: &model.Sku{ - // SpecQuality: vv.SpecQuality, - // SpecUnit: vv.SpecUnit, - // Weight: vv.Weight, - // Status: 1, - // }, - // } - // skus = append(skus, sku) - // } - // skuNameExt.Skus = skus - // _, err = cms.AddSkuName(ctx, skuNameExt, ctx.GetUserName()) - // return retVal, err - // }, gy) - // tasksch.HandleTask(task, nil, true).Run() - // task.GetID() + if skuNameExt.IsGlobal == 0 { + var skuplace []*model.SkuNamePlaceBind + var cityCodes []int + sql := ` + SELECT * FROM jxgy.sku_name_place_bind WHERE name_id = ? AND deletad_at = ? + ` + sqlParams := []interface{}{ + v.ID, utils.DefaultTimeValue, + } + err = dao.GetRows(db, &skuplace, sql, sqlParams) + for _, vv := range skuplace { + cityCodes = append(cityCodes, vv.PlaceCode) + } + if len(cityCodes) > 0 { + skuNameExt.Places = cityCodes + } + } + var skus []*model.SkuWithVendor + for _, vv := range gyskus { + sku := &model.SkuWithVendor{ + Sku: &model.Sku{ + SpecQuality: vv.SpecQuality, + SpecUnit: vv.SpecUnit, + Weight: vv.Weight, + Status: 1, + }, + } + skus = append(skus, sku) + } + skuNameExt.Skus = skus + _, err = cms.AddSkuName(ctx, skuNameExt, ctx.GetUserName()) + return retVal, err + }, gy) + tasksch.HandleTask(task, nil, true).Run() + task.GetID() return err }