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

银豹拉取商品优化

Browse Source
This commit is contained in:
苏尹岚
2020-04-01 10:08:37 +08:00
parent b1ceb21f9e
commit 25e4afd974
2 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
business/jxstore/cms/store_sku.go
View File

@@ -4062,26 +4062,27 @@ func CreateSkusAndFocusFromYb(ctx *jxcontext.Context, isAsync, isContinueWhenErr
) )
storeMaps, err := dao.GetStoresMapList2(db, []int{vendorID}, nil, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", false) storeMaps, err := dao.GetStoresMapList2(db, []int{vendorID}, nil, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", false)
handler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler) handler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler)
task := tasksch.NewParallelTask("银豹平台拉取标品", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx, for _, storeMap := range storeMaps {
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { store, _ := dao.GetStoreDetail(db, storeMap.StoreID, vendorID)
storeMap := batchItemList[0].(*model.StoreMap)
store, _ := dao.GetStoreDetail(db, storeMap.StoreID, vendorID) localSkuList, err := dao.GetStoreSkus2(db, vendorID, storeMap.StoreID, nil, false)
var ( if err != nil {
pricePercentagePack []*model.PricePercentageItem return "", err
) }
localSkuList, err := dao.GetStoreSkus2(db, vendorID, storeMap.StoreID, nil, false) localSkuMap := make(map[string]*dao.StoreSkuSyncInfo)
if err != nil { for _, v := range localSkuList {
return nil, err localSkuMap[v.VendorSkuID] = v
} }
localSkuMap := make(map[string]*dao.StoreSkuSyncInfo) remoteSkuList, err := handler.GetStoreSkusFullInfo(ctx, nil, storeMap.StoreID, storeMap.VendorStoreID, nil)
for _, v := range localSkuList { if err != nil {
localSkuMap[v.VendorSkuID] = v return "", err
} }
remoteSkuList, err := handler.GetStoreSkusFullInfo(ctx, task, storeMap.StoreID, storeMap.VendorStoreID, nil) task := tasksch.NewParallelTask("银豹平台拉取标品", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
if err != nil { func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
return retVal, err var (
} pricePercentagePack []*model.PricePercentageItem
for _, v := range remoteSkuList { v = batchItemList[0].(*partner.SkuNameInfo)
)
//长度大于7就可能是标品，非标品一般是7位，前三位是yb_store_prefix后4位是yb_name_suffix //长度大于7就可能是标品，非标品一般是7位，前三位是yb_store_prefix后4位是yb_name_suffix
if len(v.YbBarCode) > 7 { if len(v.YbBarCode) > 7 {
if localSkuMap[v.SkuList[0].VendorSkuID] == nil { if localSkuMap[v.SkuList[0].VendorSkuID] == nil {
@@ -4152,7 +4153,7 @@ func CreateSkusAndFocusFromYb(ctx *jxcontext.Context, isAsync, isContinueWhenErr
} }
outSkuNameExt, err := AddSkuName(ctx, skuNameExt, ctx.GetUserName()) outSkuNameExt, err := AddSkuName(ctx, skuNameExt, ctx.GetUserName())
if err != nil { if err != nil {
continue return retVal, err
} }
buildStoreSkuBindInfosAndFocus(ctx, db, store, v, outSkuNameExt.ID, pricePercentagePack) buildStoreSkuBindInfosAndFocus(ctx, db, store, v, outSkuNameExt.ID, pricePercentagePack)
} }
@@ -4162,15 +4163,15 @@ func CreateSkusAndFocusFromYb(ctx *jxcontext.Context, isAsync, isContinueWhenErr
} }
} }
} }
} return retVal, err
return retVal, err }, remoteSkuList)
}, storeMaps) tasksch.HandleTask(task, nil, true).Run()
tasksch.HandleTask(task, nil, true).Run() if isAsync {
if isAsync { hint = task.GetID()
hint = task.GetID() } else {
} else { _, err = task.GetResult(0)
_, err = task.GetResult(0) hint = "1"
hint = "1" }
} }
return hint, err return hint, err
} }

3
business/jxutils/datares/datares.go
View File

@@ -81,11 +81,8 @@ func RegisterDataResource(ctx *jxcontext.Context, name, resourceURL, mimeType, h
return nil, err return nil, err
} }
if imgType == model.ImgTypeMain { if imgType == model.ImgTypeMain {
fmt.Println("test1111111111111111111111111111111111")
if img.Bounds().Dx() != MainImgWidth || img.Bounds().Dy() != MainImgHeight { if img.Bounds().Dx() != MainImgWidth || img.Bounds().Dy() != MainImgHeight {
fmt.Println("test2222222222222222222222222")
return nil, fmt.Errorf("图片大小:%dx%d非法，要求必须:%dx%d", img.Bounds().Dx(), img.Bounds().Dy(), MainImgWidth, MainImgHeight) return nil, fmt.Errorf("图片大小:%dx%d非法，要求必须:%dx%d", img.Bounds().Dx(), img.Bounds().Dy(), MainImgWidth, MainImgHeight)
fmt.Println("test3333333333333333333333333333")
} }
} }
dataRes = &model.DataResource{ dataRes = &model.DataResource{