diff --git a/business/jxstore/initdata/initdata.go b/business/jxstore/initdata/initdata.go index ca86e7908..d2b897ace 100644 --- a/business/jxstore/initdata/initdata.go +++ b/business/jxstore/initdata/initdata.go @@ -445,9 +445,9 @@ func Change2JDSPU4Store(ctx *jxcontext.Context, storeIDs []int, step int, isAsyn return hint, err } -func UploadWeimobImg4SkuName(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) (hint string, err error) { +func UploadWeimobImg4SkuName(ctx *jxcontext.Context, nameIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) { db := dao.GetDB() - skuNameList, err := dao.GetSkuNames(db) + skuNameList, err := dao.GetSkuNames(db, nameIDs) if err != nil { return "", err } diff --git a/business/jxstore/skuman/skuman.go b/business/jxstore/skuman/skuman.go deleted file mode 100644 index 86161e2a5..000000000 --- a/business/jxstore/skuman/skuman.go +++ /dev/null @@ -1 +0,0 @@ -package skuman diff --git a/business/model/dao/sku.go b/business/model/dao/sku.go index 815d5b7bb..599a6f134 100644 --- a/business/model/dao/sku.go +++ b/business/model/dao/sku.go @@ -52,15 +52,19 @@ func GetSkuNameByHashCode(db *DaoDB, hashCode string) (skuName *model.SkuName, e return nil, err } -func GetSkuNames(db *DaoDB) (skuNameList []*model.SkuName, err error) { +func GetSkuNames(db *DaoDB, nameIDs []int) (skuNameList []*model.SkuName, err error) { sql := ` SELECT * - FROM sku_name - WHERE deleted_at = ? + FROM sku_name t1 + WHERE t1.deleted_at = ? ` sqlParams := []interface{}{ utils.DefaultTimeValue, } + if len(nameIDs) > 0 { + sql += " AND t1.id IN (" + GenQuestionMarks(len(nameIDs)) + ")" + sqlParams = append(sqlParams, nameIDs) + } if err = GetRows(db, &skuNameList, sql, sqlParams...); err == nil { return skuNameList, nil } diff --git a/controllers/init_data.go b/controllers/init_data.go index 6db974616..2415be80a 100644 --- a/controllers/init_data.go +++ b/controllers/init_data.go @@ -92,14 +92,19 @@ func (c *InitDataController) Change2JDSPU4Store() { // @Title 将SkuName的图片上传到微盟 // @Description 将SkuName的图片上传到微盟 // @Param token header string true "认证token" -/// @Param isAsync formData bool false "是否异步操作" +// @Param nameIDs formData string false "skuNameID" +// @Param isAsync formData bool false "是否异步操作" // @Param isContinueWhenError formData bool false "单个同步失败是否继续,缺省false" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult // @router /UploadWeimobImg4SkuName [post] func (c *InitDataController) UploadWeimobImg4SkuName() { c.callUploadWeimobImg4SkuName(func(params *tInitdataUploadWeimobImg4SkuNameParams) (retVal interface{}, errCode string, err error) { - retVal, err = initdata.UploadWeimobImg4SkuName(params.Ctx, params.IsAsync, params.IsContinueWhenError) + var nameIDs []int + if err = jxutils.Strings2Objs(params.NameIDs, &nameIDs); err != nil { + return retVal, "", err + } + retVal, err = initdata.UploadWeimobImg4SkuName(params.Ctx, nameIDs, params.IsAsync, params.IsContinueWhenError) return retVal, "", err }) }