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

去掉SkuName的ElmImgHashCode与ImgWeimob

Browse Source
This commit is contained in:
gazebo
2019-09-25 10:05:31 +08:00
parent 9cc4328706
commit 4e63f526f2
5 changed files with 55 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
business/jxstore/cms/cms.go
View File

@@ -51,6 +51,14 @@ var (
}
)
type UploadResTokenInfo struct {
Token string `json:"token,omitempty"`
Expires uint64 `json:"expires,omitempty"`
FileName string `json:"fileName,omitempty"`
Hit bool `json:"hit,omitempty"`
Img string `json:"img,omitempty"`
}
func InitServiceInfo(version string, buildTime time.Time, gitCommit string) {
buildTimeStr := ""
if !utils.IsTimeZero(buildTime) {
@@ -100,7 +108,7 @@ func GetServiceInfo(ctx *jxcontext.Context) interface{} {
return serviceInfo
}
func GetQiniuUploadToken(ctx *jxcontext.Context, suffix, hashCode string) (upTokenInfo map[string]interface{}, err error) {
func GetQiniuUploadToken(ctx *jxcontext.Context, suffix, hashCode string) (upTokenInfo *UploadResTokenInfo, err error) {
imgURL := ""
if hashCode != "" {
imgURL, _ = GetDataResource(ctx, hashCode)
@@ -110,12 +118,12 @@ func GetQiniuUploadToken(ctx *jxcontext.Context, suffix, hashCode string) (upTok
Scope: globals.QiniuBucket,
Expires: qiniuTokenExpires,
}
upTokenInfo = map[string]interface{}{
"token": putPolicy.UploadToken(api.QiniuAPI),
"expires": putPolicy.Expires,
"fileName": jxutils.GenPicFileName(suffix),
"hit": imgURL != "",
"img": imgURL,
upTokenInfo = &UploadResTokenInfo{
Token: putPolicy.UploadToken(api.QiniuAPI),
Expires: putPolicy.Expires,
FileName: jxutils.GenPicFileName(suffix),
Hit: imgURL != "",
Img: imgURL,
}
return upTokenInfo, err
}

6
business/jxstore/cms/sku.go
View File

@@ -425,7 +425,6 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, isBySku bool, params ma
t1.unit,
t1.price,
t1.img,
t1.elm_img_hash_code,
t1.status,
t1.is_spu,
t1.img_hash_code,
@@ -452,7 +451,6 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, isBySku bool, params ma
t1.unit,
t1.price,
t1.img,
t1.elm_img_hash_code,
t1.status,
t1.is_spu,
t1.img_hash_code,
@@ -593,7 +591,7 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
dao.Rollback(db)
return nil, err
}
skuNameExt.ImgWeimob = imgHintMap[model.VendorIDWSC]
// skuNameExt.ImgWeimob = imgHintMap[model.VendorIDWSC]
skuNameExt.ImgEbai = imgHintMap[model.VendorIDEBAI]
if skuNameExt.DescImg != "" && getAndSetEbaiUploadRTFShopID() != "" {
@@ -692,7 +690,7 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
dao.Rollback(db)
return 0, err
}
valid["ImgWeimob"] = imgHintMap[model.VendorIDWSC]
// valid["ImgWeimob"] = imgHintMap[model.VendorIDWSC]
valid["ImgEbai"] = imgHintMap[model.VendorIDEBAI]
}
if valid["descImg"] != nil {

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

@@ -286,30 +286,30 @@ func InitVendorCategory(ctx *jxcontext.Context, vendorID int) (num int64, err er
}
func UploadWeimobImg4SkuName(ctx *jxcontext.Context, nameIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) {
db := dao.GetDB()
skuNameList, err := dao.GetSkuNames(db, nameIDs)
if err != nil {
return "", err
}
rootTask := tasksch.NewParallelTask("UploadWeimobImg4SkuName", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError).SetParallelCount(5), ctx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
skuName := batchItemList[0].(*model.SkuName)
if skuName.Img != "" && skuName.ImgWeimob == "" {
if globals.EnableWscStoreWrite {
if skuName.ImgWeimob, err = api.WeimobAPI.UploadImgByURL(skuName.Img, ""); err == nil {
_, err = dao.UpdateEntity(db, skuName, "ImgWeimob")
}
}
}
return nil, err
}, skuNameList)
tasksch.ManageTask(rootTask).Run()
// db := dao.GetDB()
// skuNameList, err := dao.GetSkuNames(db, nameIDs)
// if err != nil {
// return "", err
// }
// rootTask := tasksch.NewParallelTask("UploadWeimobImg4SkuName", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError).SetParallelCount(5), ctx,
// func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
// skuName := batchItemList[0].(*model.SkuName)
// if skuName.Img != "" && skuName.ImgWeimob == "" {
// if globals.EnableWscStoreWrite {
// if skuName.ImgWeimob, err = api.WeimobAPI.UploadImgByURL(skuName.Img, ""); err == nil {
// _, err = dao.UpdateEntity(db, skuName, "ImgWeimob")
// }
// }
// }
// return nil, err
// }, skuNameList)
// tasksch.ManageTask(rootTask).Run()
if !isAsync {
_, err = rootTask.GetResult(0)
} else {
hint = rootTask.ID
}
// if !isAsync {
// _, err = rootTask.GetResult(0)
// } else {
// hint = rootTask.ID
// }
return hint, err
}