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

- SplitSkuName don't use comment as name

Browse Source 
- add DownloadFileByURL
- refactor UploadWeimobImg4SkuName
- ignore RefreshMissingDadaStores error
- add BuildSkuFromEbaiStore
This commit is contained in:
gazebo
2019-03-20 09:31:33 +08:00
parent d0587fef0a
commit d8b7b41b01
8 changed files with 311 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,12 +6,12 @@ import (
"strings"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxstore/initdata"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
)
type SkuNamesInfo struct {
@@ -452,6 +452,23 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
skuNameExt.SpecQuality = skuNameExt.Skus[0].SpecQuality
skuNameExt.SpecUnit = skuNameExt.Skus[0].SpecUnit
}
imgContent, imgMD5, err := jxutils.DownloadFileByURL(skuNameExt.Img)
if err != nil {
dao.Rollback(db)
return nil, err
}
if globals.EnableWscStoreWrite {
if skuNameExt.ImgWeimob, err = api.WeimobAPI.UploadImg(imgContent, ""); err != nil {
dao.Rollback(db)
return nil, err
}
}
if skuNameExt.ImgHashCode == "" {
skuNameExt.ImgHashCode = imgMD5
} else if skuNameExt.ImgHashCode != imgMD5 {
dao.Rollback(db)
return nil, errors.New("图片HASH值不同")
}
if err = dao.CreateEntity(db, &skuNameExt.SkuName); err != nil {
dao.Rollback(db)
return nil, err
@@ -488,7 +505,6 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
}
outSkuNameExt = tmpInfo.SkuNames[0]
_, err = CurVendorSync.SyncSku(ctx, db, outSkuNameExt.SkuName.ID, -1, false, false, userName)
initdata.UploadWeimobImg4SkuName(ctx, []int{skuNameExt.SkuName.ID}, true, true)
return outSkuNameExt, err
}
@@ -510,6 +526,16 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
dao.Begin(db)
defer dao.Rollback(db)
if valid["img"] != "" {
imgContent, imgMD5, err2 := jxutils.DownloadFileByURL(valid["img"].(string))
if err = err2; err != nil {
return 0, err
}
valid["ImgHashCode"] = imgMD5
if globals.EnableWscStoreWrite {
if valid["ImgWeimob"], err = api.WeimobAPI.UploadImg(imgContent, ""); err != nil {
return 0, err
}
}
valid["imgWeimob"] = ""
}
if num, err = dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, skuName, valid, userName, nil, model.FieldJdSyncStatus, model.SyncFlagModifiedMask); err == nil && num == 1 {
@@ -538,9 +564,6 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
if err == nil {
dao.Commit(db)
_, err = CurVendorSync.SyncSku(ctx, db, nameID, -1, false, false, userName)
if valid["img"] != "" {
initdata.UploadWeimobImg4SkuName(ctx, []int{nameID}, true, true)
}
}
}
}